Merge pull request #489 from jcsirot/dynamic-provisioned-ci-nodes

silvin-lubecki · web-flow · commit c42f46856826 · 2019-03-20T16:40:04.000+01:00
Use a dynamically provisioned linux node
diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
@@ -2,7 +2,7 @@ properties([buildDiscarder(logRotator(numToKeepStr: '20'))])
 
 pipeline {
     agent {
-        label 'team-local && pipeline'
+        label 'ubuntu-1804'
     }
 
     options {
@@ -14,7 +14,7 @@ pipeline {
             parallel {
                 stage('Binaries'){
                     agent {
-                        label 'team-local && linux'
+                        label 'ubuntu-1804'
                     }
                     steps  {
                         dir('src/github.com/docker/app') {
@@ -51,7 +51,7 @@ pipeline {
                 }
                 stage('Invocation image'){
                     agent {
-                        label 'team-local && linux'
+                        label 'ubuntu-1804'
                     }
                     steps {
                         dir('src/github.com/docker/app') {
@@ -84,7 +84,7 @@ pipeline {
                         CODECOV_TOKEN = credentials('jenkins-codecov-token')
                     }
                     agent {
-                        label 'team-local && linux'
+                        label 'ubuntu-1804'
                     }
                     steps {
                         dir('src/github.com/docker/app') {
@@ -108,7 +108,7 @@ pipeline {
                 }
                 stage("Gradle test") {
                     agent {
-                        label 'team-local && linux'
+                        label 'ubuntu-1804'
                     }
                     steps {
                         dir('src/github.com/docker/app') {
@@ -127,7 +127,7 @@ pipeline {
                 }
                 stage("Test Linux") {
                     agent {
-                        label 'team-local && linux'
+                        label 'ubuntu-1804'
                     }
                     environment {
                         DOCKERAPP_BINARY = '../docker-app-linux'
@@ -231,7 +231,7 @@ pipeline {
                 buildingTag()
             }
             agent {
-                label 'team-local && linux'
+                label 'ubuntu-1804'
             }
             environment {
                 DOCKERHUB_CREDS=credentials('dockerhub-dockerdsgcibot')

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ properties([buildDiscarder(logRotator(numToKeepStr: '20'))])`
`2`	`2`
`3`	`3`	`pipeline {`
`4`	`4`	`agent {`
`5`		`- label 'team-local && pipeline'`
	`5`	`+ label 'ubuntu-1804'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`options {`
`@@ -14,7 +14,7 @@ pipeline {`
`14`	`14`	`parallel {`
`15`	`15`	`stage('Binaries'){`
`16`	`16`	`agent {`
`17`		`- label 'team-local && linux'`
	`17`	`+ label 'ubuntu-1804'`
`18`	`18`	`}`
`19`	`19`	`steps {`
`20`	`20`	`dir('src/github.com/docker/app') {`
`@@ -51,7 +51,7 @@ pipeline {`
`51`	`51`	`}`
`52`	`52`	`stage('Invocation image'){`
`53`	`53`	`agent {`
`54`		`- label 'team-local && linux'`
	`54`	`+ label 'ubuntu-1804'`
`55`	`55`	`}`
`56`	`56`	`steps {`
`57`	`57`	`dir('src/github.com/docker/app') {`
`@@ -84,7 +84,7 @@ pipeline {`
`84`	`84`	`CODECOV_TOKEN = credentials('jenkins-codecov-token')`
`85`	`85`	`}`
`86`	`86`	`agent {`
`87`		`- label 'team-local && linux'`
	`87`	`+ label 'ubuntu-1804'`
`88`	`88`	`}`
`89`	`89`	`steps {`
`90`	`90`	`dir('src/github.com/docker/app') {`
`@@ -108,7 +108,7 @@ pipeline {`
`108`	`108`	`}`
`109`	`109`	`stage("Gradle test") {`
`110`	`110`	`agent {`
`111`		`- label 'team-local && linux'`
	`111`	`+ label 'ubuntu-1804'`
`112`	`112`	`}`
`113`	`113`	`steps {`
`114`	`114`	`dir('src/github.com/docker/app') {`
`@@ -127,7 +127,7 @@ pipeline {`
`127`	`127`	`}`
`128`	`128`	`stage("Test Linux") {`
`129`	`129`	`agent {`
`130`		`- label 'team-local && linux'`
	`130`	`+ label 'ubuntu-1804'`
`131`	`131`	`}`
`132`	`132`	`environment {`
`133`	`133`	`DOCKERAPP_BINARY = '../docker-app-linux'`
`@@ -231,7 +231,7 @@ pipeline {`
`231`	`231`	`buildingTag()`
`232`	`232`	`}`
`233`	`233`	`agent {`
`234`		`- label 'team-local && linux'`
	`234`	`+ label 'ubuntu-1804'`
`235`	`235`	`}`
`236`	`236`	`environment {`
`237`	`237`	`DOCKERHUB_CREDS=credentials('dockerhub-dockerdsgcibot')`