Devel

Jenkinsfile

@@ -0,0 +1,61 @@
+pipeline {
+    agent any
+    options {
+        checkoutToSubdirectory('argo-probe-eudat-b2access')
+    }
+    environment {
+        PROJECT_DIR="argo-probe-eudat-b2access"
+        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-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 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
+                    }
+                    post {
+                        always {
+                            cleanWs()
+                        }
+                    }
+                } 
+            }
+        }
+    }
+    post {
+        always {
+            cleanWs()
+        }
+        success {
+            script{
+                if ( env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'devel' ) {
+                    slackSend( message: ":rocket: New version for <$BUILD_URL|$PROJECT_DIR>:$BRANCH_NAME Job: $JOB_NAME !")
+                }
+            }
+        }
+        failure {
+            script{
+                if ( env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'devel' ) {
+                    slackSend( message: ":rain_cloud: Build Failed for <$BUILD_URL|$PROJECT_DIR>:$BRANCH_NAME Job: $JOB_NAME")
+                }
+            }   
+        }
+    }
+}

Makefile

@@ -1,12 +1,9 @@
-PKGNAME=nagios-plugins-eudat-b2access
+PKGNAME=argo-probe-eudat-b2access
 SPECFILE=${PKGNAME}.spec
-FILES=check_b2access.py ${SPECFILE}
+FILES=check_b2access.py check_b2access_simple.py ${SPECFILE}
 
 PKGVERSION=$(shell grep -s '^Version:' $(SPECFILE) | sed -e 's/Version:\s*//')
 
-srpm: dist
-	rpmbuild -ts --define='dist .el6' ${PKGNAME}-${PKGVERSION}.tar.gz
-
 rpm: dist
 	rpmbuild -ta ${PKGNAME}-${PKGVERSION}.tar.gz
 
@@ -22,4 +19,4 @@ sources: dist
 
 clean:
 	rm -rf ${PKGNAME}-${PKGVERSION}.tar.gz
-	rm -rf dist
+	rm -rf dist

nagios-plugins-eudat-b2access.spec → argo-probe-eudat-b2access.spec

@@ -13,28 +13,25 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-Name:		nagios-plugins-eudat-b2access
-Version:	0.3
+Name:		argo-probe-eudat-b2access
+Version:	0.5
 Release:	1%{?dist}
-Summary:	Nagios B2ACCESS probes
+Summary:	Monitoring metrics for B2ACCESS
 License:	Apache License, Version 2.0
 Packager:	Shiraz Memon <a.memon@fz-juelich.de>
 
 Source:		%{name}-%{version}.tar.gz
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}
 
-Requires:	python
-Requires:	python-argparse
-Requires:	python-lxml
-Requires:	python-simplejson
-Requires:	python-defusedxml
-Requires:	python-httplib2
-Requires:	python-requests
-
+Requires:	python3
+Requires: python3-requests
+Requires: python3-oauthlib
+Requires: python3-requests-oauthlib
+Requires: python3-urllib3
 
 %description
-Nagios probes to check functionality of B2ACCESS Service
+Monitoring metrics to check functionality of B2ACCESS Service
 
 %prep
 %setup -q
@@ -44,17 +41,25 @@ Nagios probes to check functionality of B2ACCESS Service
 
 %install
 
-install -d %{buildroot}/%{_libexecdir}/argo-monitoring/probes/%{probe_namespace}
-install -m 755 check_b2access.py %{buildroot}/%{_libexecdir}/argo-monitoring/probes/%{probe_namespace}/check_b2access.py
+install -d %{buildroot}/%{_libexecdir}/argo/probes/%{probe_namespace}
+install -m 755 check_b2access.py %{buildroot}/%{_libexecdir}/argo/probes/%{probe_namespace}/check_b2access.py
+install -m 755 check_b2access_simple.py %{buildroot}/%{_libexecdir}/argo/probes/%{probe_namespace}/check_b2access_simple.py
 
 %files
-%dir /%{_libexecdir}/argo-monitoring
-%dir /%{_libexecdir}/argo-monitoring/probes/
-%dir /%{_libexecdir}/argo-monitoring/probes/%{probe_namespace}
+%dir /%{_libexecdir}/argo
+%dir /%{_libexecdir}/argo/probes/
+%dir /%{_libexecdir}/argo/probes/%{probe_namespace}
 
-%attr(0755,root,root) /%{_libexecdir}/argo-monitoring/probes/%{probe_namespace}/check_b2access.py
+%attr(0755,root,root) /%{_libexecdir}/argo/probes/%{probe_namespace}/check_b2access.py
+%attr(0755,root,root) /%{_libexecdir}/argo/probes/%{probe_namespace}/check_b2access_simple.py
 
 %changelog
+* Mon Jul 14 2024 Marvin Winkens <m.winkens@fz-juelich.de> - 1.0-1
+- Updated to python 3
+* Tue Mar 15 2022 Themis Zamani <themiszamani@gmail.com> - 0.4-2
+- Update the spec file requirements 
+ * Mon Jan 24 2022 Themis Zamani <themiszamani@gmail.com> - 0.4-2
+- Update the spec file requirements 
 * Tue Jun 05 2018 Shiraz Memon <a.memon@fz-juelich.de> - 0.4-1
 - Adapted to Unity v2.x.x REST API
 - More details in verbose mode
@@ -64,4 +69,4 @@ install -m 755 check_b2access.py %{buildroot}/%{_libexecdir}/argo-monitoring/pro
 * Thu Sep 15 2016 Shiraz Memon <a.memon@fz-juelich.de> - 0.2-1
 - Updated namespace and license information
 * Thu Jul 28 2016 Shiraz Memon <a.memon@fz-juelich.de> - 0.1-1
-- Initial version of the package 
+- Initial version of the package