Move names and paths into variables

Chris Park · Chris Park · commit 0577a7d636c5 · 2017-08-29T11:00:10.000-04:00
diff --git a/Jenkinsfile.examples b/Jenkinsfile.examples
@@ -1,6 +1,7 @@
 node {
     def SOURCEDIR = pwd()
     def TEST_CONTAINER = 'examples/python-test'
+    def DOCKERFILE_DIR = './examples/docker'
     try {
         stage("Clean up") {
             step([$class: 'WsCleanup'])
@@ -9,11 +10,11 @@ node {
             checkout scm
         }
         stage("Build Dockerfile") {
-            dir ('./examples/docker') {
+            dir ("${DOCKERFILE_DIR}") {
                 docker.build("${TEST_CONTAINER}")
             }
         }
-        stage("Run Tests") {
+        stage("Run Examples") {
             withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${env.BINDING_TEST_URL}"]) {
                 sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source ${TEST_CONTAINER}"
             }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`node {`
`2`	`2`	`def SOURCEDIR = pwd()`
`3`	`3`	`def TEST_CONTAINER = 'examples/python-test'`
	`4`	`+ def DOCKERFILE_DIR = './examples/docker'`
`4`	`5`	`try {`
`5`	`6`	`stage("Clean up") {`
`6`	`7`	`step([$class: 'WsCleanup'])`
`@@ -9,11 +10,11 @@ node {`
`9`	`10`	`checkout scm`
`10`	`11`	`}`
`11`	`12`	`stage("Build Dockerfile") {`
`12`		`- dir ('./examples/docker') {`
	`13`	`+ dir ("${DOCKERFILE_DIR}") {`
`13`	`14`	`docker.build("${TEST_CONTAINER}")`
`14`	`15`	`}`
`15`	`16`	`}`
`16`		`- stage("Run Tests") {`
	`17`	`+ stage("Run Examples") {`
`17`	`18`	`withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${env.BINDING_TEST_URL}"]) {`
`18`	`19`	`sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source ${TEST_CONTAINER}"`
`19`	`20`	`}`