Updated Jenkinsfiles

Chris Park · Chris Park · commit b1eb3908c2f6 · 2017-10-27T14:05:13.000-04:00
- to look for upstream ALT_URL
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,7 +8,9 @@ node {
             checkout scm
         }
         stage("Test with Docker") {
-            withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${env.BINDING_TEST_URL}"]) {
+            echo "${env.ALT_URL}"
+            def useUrl = ("${env.ALT_URL}" == "null") ? "${env.BINDING_TEST_URL}" : "${env.ALT_URL}"
+            withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${useUrl}"]) {
                 sh "docker pull rosetteapi/docker-python"
                 sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source rosetteapi/docker-python"
             }
diff --git a/Jenkinsfile.examples b/Jenkinsfile.examples
@@ -15,7 +15,9 @@ node {
             }
         }
         stage("Run Examples") {
-            withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${env.BINDING_TEST_URL}"]) {
+            echo "${env.ALT_URL}"
+            def useUrl = ("${env.ALT_URL}" == "null") ? "${env.BINDING_TEST_URL}" : "${env.ALT_URL}"
+            withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${useUrl}"]) {
                 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
`@@ -8,7 +8,9 @@ node {`
`8`	`8`	`checkout scm`
`9`	`9`	`}`
`10`	`10`	`stage("Test with Docker") {`
`11`		`- withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${env.BINDING_TEST_URL}"]) {`
	`11`	`+ echo "${env.ALT_URL}"`
	`12`	`+ def useUrl = ("${env.ALT_URL}" == "null") ? "${env.BINDING_TEST_URL}" : "${env.ALT_URL}"`
	`13`	`+ withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${useUrl}"]) {`
`12`	`14`	`sh "docker pull rosetteapi/docker-python"`
`13`	`15`	`sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source rosetteapi/docker-python"`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ node {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`stage("Run Examples") {`
`18`		`- withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${env.BINDING_TEST_URL}"]) {`
	`18`	`+ echo "${env.ALT_URL}"`
	`19`	`+ def useUrl = ("${env.ALT_URL}" == "null") ? "${env.BINDING_TEST_URL}" : "${env.ALT_URL}"`
	`20`	`+ withEnv(["API_KEY=${env.ROSETTE_API_KEY}", "ALT_URL=${useUrl}"]) {`
`19`	`21`	`sh "docker run --rm -e API_KEY=${API_KEY} -e ALT_URL=${ALT_URL} -v ${SOURCEDIR}:/source ${TEST_CONTAINER}"`
`20`	`22`	`}`
`21`	`23`	`}`