#978 Clean up Jenkins files
Merged 9 months ago by mprahl. Opened 9 months ago by mprahl.

file modified
+5 -9

@@ -24,11 +24,11 @@ 

  node('factory2'){

  

      properties([

-             parameters([

-                 string(defaultValue: "", description: "", name: "REPO"),

-                 string(defaultValue: "", description: "", name: "BRANCH"),

-                 ])

-             ])

+         parameters([

+             string(defaultValue: "", description: "", name: "REPO"),

+             string(defaultValue: "", description: "", name: "BRANCH"),

+         ])

+     ])

  

      stage('Allocate Node'){

          env.CICO_API_KEY = readFile("${env.HOME}/duffy.key").trim()

@@ -42,13 +42,11 @@ 

  

      try{

          stage('Pre Setup Node'){

-             // Install EPEL and the SCLs repo

              onmyduffynode 'yum -y install git docker && systemctl start docker'

          }

  

          stage('Clone Test Suite') {

              onmyduffynode "git clone --single-branch --depth 1 https://pagure.io/fm-orchestrator.git"

- 

              onmyduffynode "cd fm-orchestrator && git remote add proposed \"${env.REPO}\""

              onmyduffynode "cd fm-orchestrator && git fetch proposed"

              onmyduffynode "cd fm-orchestrator && git checkout origin/master"

@@ -56,8 +54,6 @@ 

              onmyduffynode "cd fm-orchestrator && git config --global user.name CentOS CI"

              onmyduffynode "cd fm-orchestrator && git merge --no-ff \"proposed/${env.BRANCH}\" -m \'Merge PR\'"

              onmyduffynode "cd fm-orchestrator && git log -2"

- 

- 

          }

  

          stage('Build Docker Image') {

file removed
-53

@@ -1,53 +0,0 @@ 

- def onmyduffynode(script){

-     ansiColor('xterm'){

-         timestamps{

-             sh 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root ${DUFFY_NODE}.ci.centos.org -t "' + script + '"'

-         }

-     }

- }

- 

- def syncfromduffynode(rsyncpath){

-     sh 'rsync -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root " -Ha --include=' +  rsyncpath +  " ${DUFFY_NODE}.ci.centos.org:~/ ./"

- }

- 

- node('factory2'){

- 

-     stage('Allocate Node'){

-         env.CICO_API_KEY = readFile("${env.HOME}/duffy.key").trim()

-         duffy_rtn=sh(

-             script: 'cico --debug node get -f value -c hostname -c comment',

-             returnStdout: true

-             ).trim().tokenize(' ')

-         env.DUFFY_NODE=duffy_rtn[0]

-         env.SSID=duffy_rtn[1]

-     }

- 

-     try{

-         stage('Pre Setup Node'){

-             // Install EPEL and the SCLs repo

-             onmyduffynode 'yum -y install git docker && systemctl start docker'

-         }

- 

-         stage('Clone Test Suite') {

-             onmyduffynode "git clone -b \"${env.BRANCH_NAME}\" --single-branch --depth 1 https://pagure.io/fm-orchestrator"

-         }

- 

-         stage('Build Docker Image') {

-             onmyduffynode 'cd fm-orchestrator && docker build -t mbs/test -f docker/Dockerfile-tests .'

-         }

- 

-         stage('Run Test Suite') {

-             timeout(20) {

-                 onmyduffynode 'docker run -v ~/fm-orchestrator:/src:Z mbs/test'

-             }

-         }

- 

-     }catch (e){

-         currentBuild.result = "FAILED"

-         throw e 

-     } finally {

-         stage('Deallocate Node'){

-             sh 'cico node done ${SSID}'

-         }

-     }

- }

no initial comment

Looks like CI is working. I'll go ahead and merge this.

Pull-Request has been merged by mprahl

9 months ago