Merge pull request #2752 from ARMmbed/jenkinsfile

sg- · web-flow · commit cc69dedac2ea · 2016-09-22T00:48:33.000-05:00
Update Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,6 +14,9 @@ def toolchains = [
   GCC_ARM: "arm-none-eabi-gcc"
   ]
 
+// mbed.getCurrentBranch returns either local branch name or reference to pull request
+def currentBranch = mbed.getCurrentBranch()
+
 // Create a map of predefined build steps 
 def parallelSteps = mbed.createParalleSteps("mbed-os", targets, toolchains)
 
@@ -25,5 +28,5 @@ def testApps = [
   "mbed-client-testapp"
   ]
 
-// buildTestApps accepts array of test application names and a mbed-os commit hash as parameters
-mbed.buildTestApps(testApps, "${env.GIT_REVISION}")
+// buildTestApps accepts array of test application names and a mbed-os branch or PR reference as parameters
+mbed.buildTestApps(testApps, "${currentBranch}")

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ def toolchains = [`
`14`	`14`	`GCC_ARM: "arm-none-eabi-gcc"`
`15`	`15`	`]`
`16`	`16`
	`17`	`+// mbed.getCurrentBranch returns either local branch name or reference to pull request`
	`18`	`+def currentBranch = mbed.getCurrentBranch()`
	`19`	`+`
`17`	`20`	`// Create a map of predefined build steps`
`18`	`21`	`def parallelSteps = mbed.createParalleSteps("mbed-os", targets, toolchains)`
`19`	`22`
`@@ -25,5 +28,5 @@ def testApps = [`
`25`	`28`	`"mbed-client-testapp"`
`26`	`29`	`]`
`27`	`30`
`28`		`-// buildTestApps accepts array of test application names and a mbed-os commit hash as parameters`
`29`		`-mbed.buildTestApps(testApps, "${env.GIT_REVISION}")`
	`31`	`+// buildTestApps accepts array of test application names and a mbed-os branch or PR reference as parameters`
	`32`	`+mbed.buildTestApps(testApps, "${currentBranch}")`