diff --git a/Jenkinsfile b/Jenkinsfile index a4114fb..8b848e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,10 @@ pipeline { agent any options { - checkoutToSubdirectory('nagios-plugins-eudat-b2share') + checkoutToSubdirectory('argo-probe-eudat-b2share') } environment { - PROJECT_DIR="nagios-plugins-eudat-b2share" + PROJECT_DIR="argo-probe-eudat-b2share" 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_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() @@ -13,27 +13,7 @@ pipeline { stages { stage ('Build'){ parallel { - stage ('Build Centos 6') { - agent { - docker { - image 'argo.registry:5000/epel-6-ams' - args '-u jenkins:jenkins' - } - } - steps { - echo 'Building Rpm...' - withCredentials(bindings: [sshUserPrivateKey(credentialsId: 'jenkins-rpm-repo', usernameVariable: 'REPOUSER', \ - keyFileVariable: 'REPOKEY')]) { - sh "/home/jenkins/build-rpm.sh -w ${WORKSPACE} -b ${BRANCH_NAME} -d centos6 -p ${PROJECT_DIR} -s ${REPOKEY}" - } - archiveArtifacts artifacts: '**/*.rpm', fingerprint: true - } - post { - always { - cleanWs() - } - } - } + stage ('Build Centos 7') { agent { docker { diff --git a/Makefile b/Makefile index 782c2a7..df2a0e4 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,9 @@ -PKGNAME=nagios-plugins-eudat-b2share +PKGNAME=argo-probe-eudat-b2share SPECFILE=${PKGNAME}.spec FILES=check_b2share.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 \ No newline at end of file + rm -rf dist