Merge pull request #14 from ARGOeu-Metrics/devel

Version 0.3.1
ARGOeu-Metrics · Apr 4, 2024 · 9ca4173 · 9ca4173
2 parents a0168af + 30e8f28
commit 9ca4173
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,29 +11,39 @@ pipeline {
 
     }
     stages {
-        stage ('Build'){
+        stage ('Building'){
             parallel {
-
-                stage ('Build Centos 7') {
+                stage ('Build CentOS 7') {
                     agent {
                         docker {
                             image 'argo.registry:5000/epel-7-ams'
                             args '-u jenkins:jenkins'
                         }
                     }
                     steps {
-                        echo 'Building Rpm...'
+                        echo 'Building CentOS 7 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}"
                         }
                         archiveArtifacts artifacts: '**/*.rpm', fingerprint: true
                     }
-                    post {
-                        always {
-                            cleanWs()
+                }
+                stage ('Build Rocky 9') {
+                    agent {
+                        docker {
+                            image 'argo.registry:5000/epel-9-ams'
+                            args '-u jenkins:jenkins'
                         }
                     }
+                    steps {
+                        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 rocky9 -p ${PROJECT_DIR} -s ${REPOKEY}"
+                        }
+                        archiveArtifacts artifacts: '**/*.rpm', fingerprint: true
+                    }
                 }
             }
         }

diff --git a/argo-probe-argo-servicestatus.spec b/argo-probe-argo-servicestatus.spec
@@ -1,7 +1,7 @@
 %global __python %{python3}
 
 Name:		argo-probe-argo-servicestatus
-Version:	0.3.0
+Version:	0.3.1
 Release:	1%{?dist}
 Summary:	Monitoring scripts that check service status
 License:	GPLv3+
@@ -12,7 +12,15 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}
 AutoReqProv:    no
 
 BuildRequires: python3-devel
-Requires: python36-requests
+
+%if 0%{?el7}
+Requires:      python36-requests
+
+%else
+Requires:      python3-requests
+
+%endif
+
 
 %description
 Generic ARGO probe to check service availabilty
@@ -34,6 +42,8 @@ install -m 755 check_status.py %{buildroot}/%{_libexecdir}/argo/probes/argo-serv
 %attr(0755,root,root) /%{_libexecdir}/argo/probes/argo-servicestatus/check_status.py
 
 %changelog
+* Thu Apr 4 2024 Katarina Zailac <kzailac@srce.hr> - 0.3.1-1
+- AO-931 Create Rocky 9 RPM for argo-probe-argo-servicestatus
 * Thu Mar 7 2024 Katarina Zailac <kzailac@srce.hr> - 0.3.0-1
 - ARGO-4476 Add performance data to argo-probe-argo-servicestatus
 * Thu Jul 6 2023 Katarina Zailac <kzailac@srce.hr> - 0.2.0-1