Merge pull request #24 from ARGOeu-Metrics/devel

Version 2.9
ARGOeu-Metrics · Jul 31, 2024 · 2fc3972 · 2fc3972
2 parents e28195e + 100743b
commit 2fc3972
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,25 +6,25 @@ pipeline {
     environment {
         PROJECT_DIR="argo-probe-eudat-b2find"
         GIT_COMMIT=sh(script: "cd ${WORKSPACE}/$PROJECT_DIR && git log -1 --format=\"%H\"",returnStdout: true).trim()
-        GIT_COMMIT_HASH=sh(script: "cd ${WORKSPACE}/$PROJECT_DIR && git log -1 --format=\"%H\" | cut -c1-7",returnStdout: true).trim()
+        GIT_COMMIT_HASH=sh(script: "cd ${WORKSPACE}/$PROJECT_DIR && git log -1 --format=\"%H\" | cut -c1-9",returnStdout: true).trim()
         GIT_COMMIT_DATE=sh(script: "date -d \"\$(cd ${WORKSPACE}/$PROJECT_DIR && git show -s --format=%ci ${GIT_COMMIT_HASH})\" \"+%Y%m%d%H%M%S\"",returnStdout: true).trim()
 
     }
     stages {
         stage ('Build'){
             parallel {
-                stage ('Build Centos 7') {
+                stage ('Build Centos 9') {
                     agent {
                         docker {
-                            image 'argo.registry:5000/epel-7-ams'
+                            image 'argo.registry:5000/epel-9-ams'
                             args '-u jenkins:jenkins'
                         }
                     }
                     steps {
-                        echo 'Building Rpm...'
-                        withCredentials(bindings: [sshUserPrivateKey(credentialsId: 'jenkins-rpm-repo', usernameVariable: 'REPOUSER', \
+                        echo 'Building Rocky 9 RPM...'
+                           withCredentials(bindings: [sshUserPrivateKey(credentialsId: 'jenkins-rpm-repo', usernameVariable: 'REPOUSER', \
                                                                     keyFileVariable: 'REPOKEY')]) {
-                            sh "/home/jenkins/build-rpm.sh -w ${WORKSPACE} -b ${BRANCH_NAME} -d centos7 -p ${PROJECT_DIR} -s ${REPOKEY}"
+                       sh "/home/jenkins/build-rpm.sh -w ${WORKSPACE} -b ${BRANCH_NAME} -d rocky9 -p ${PROJECT_DIR} -s ${REPOKEY}"
                         }
                         archiveArtifacts artifacts: '**/*.rpm', fingerprint: true
                     }

diff --git a/Makefile b/Makefile
@@ -3,11 +3,15 @@ SPECFILE=${PKGNAME}.spec
 FILES=checkB2FIND.py ${SPECFILE}
 PKGVERSION=$(shell grep -s '^Version:' $(SPECFILE) | sed -e 's/Version:\s*//')
 
+rpm: dist
+	rpmbuild -ta ${PKGNAME}-${PKGVERSION}.tar.gz
+
 dist:
 	rm -rf dist
 	mkdir -p dist/${PKGNAME}-${PKGVERSION}
 	cp -pr ${FILES} dist/${PKGNAME}-${PKGVERSION}/
-	cd dist ; tar cfz ../${PKGNAME}-${PKGVERSION}.tar.gz ${PKGNAME}-${PKGVERSION}
+	tar zcf dist/${PKGNAME}-${PKGVERSION}.tar.gz -C dist ${PKGNAME}-${PKGVERSION}
+	mv dist/${PKGNAME}-${PKGVERSION}.tar.gz .
 	rm -rf dist
 
 sources: dist

diff --git a/argo-probe-eudat-b2find.spec b/argo-probe-eudat-b2find.spec
@@ -1,6 +1,6 @@
 Name:		argo-probe-eudat-b2find
-Version:	2.8
-Release:	3%{?dist}
+Version:	2.9
+Release:	1%{?dist}
 Summary:	B2FIND metrics to check the functionality of the service.
 License:	GPLv3+
 Packager:	Heinrich Widmann <widmann@dkrz.de>
@@ -12,12 +12,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}
 
 
 #BuildRequires:
-Requires:	python
-Requires:	python-argparse
-Requires:	python-requests
-#Requires:	python-json
-#Requires:	python-urllib
-#Requires:	python-urllib2
+Requires:	python3
+Requires:	python3-requests
 
 %description
 This plugin provides the nessecary script to check search functionality of the B2FIND discovery service b2find.eudat.eu .
@@ -40,6 +36,8 @@ install -m 755 checkB2FIND.py %{buildroot}/%{_libexecdir}/argo/probes/eudat-b2fi
 %pre
 
 %changelog
+* Fri Jul 31 2024 Themis Zamani <themis@admin.grnet.gr> - 2.9-1
+- Update/upgrade to python3 for Rocky9
 * Fri May 05 2023 Themis Zamani <themis@admin.grnet.gr> - 2.8-1
 - AO-790 Metrics b2find - showGroupEnes produces an UNKNOWN state
 * Thu Sep 22 2022 Katarina Zailac <kzailac@srce.hr> - 2.7-1