commit 58703db72b9e4f138a6783ca6dc6dfc4c29d5981
author Colin Thorbinson <colin.thorbinson@arm.com> Tue Nov 24 12:02:19 2020 +0000
committer Karl Zhang <karl.zhang@arm.com> Wed Dec 02 06:39:40 2020 +0000
tree ba7b3fab09b95e3d518566da64c451918f0de7ef
parent e334e26a9335687ee78de2c1c5a93ecac504aa36

Update pipeline to pass variable to downstream job

Update piplines to allow CI_SCRIPTS_BRANCH variable to be used in
downstream jobs.

Fix: Update build pipelines to checkout code rather than using the git
plugin. This is due to a bug in the Jenkins git plugin that does not
fetch tags.

Signed-off-by: Colin Thorbinson <colin.thorbinson@arm.com>
Change-Id: I902496b0a96129fa25557e2051330cda8f4a0fd1

src/org/trustedfirmware/Gerrit.groovy

diff --git a/src/org/trustedfirmware/Gerrit.groovy b/src/org/trustedfirmware/Gerrit.groovy
index fa8f2a7..3c2f41d 100644
--- a/src/org/trustedfirmware/Gerrit.groovy
+++ b/src/org/trustedfirmware/Gerrit.groovy
@@ -11,7 +11,7 @@
   node("docker-amd64-tf-m-bionic") {
     cleanWs()
     dir("tf-m-ci-scripts") {
-      git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
+      checkout([$class: 'GitSCM', branches: [[name: '$CI_SCRIPTS_BRANCH']], userRemoteConfigs: [[credentialsId: 'GIT_SSH_KEY', url: '$CI_SCRIPTS_REPO']]])
     }
     verifyStatusInWorkspace(value, verify_name, category)
   }
@@ -39,7 +39,7 @@
   node("docker-amd64-tf-m-bionic") {
     cleanWs()
     dir("tf-m-ci-scripts") {
-      git url: '$CI_SCRIPTS_REPO', branch: '$CI_SCRIPTS_BRANCH', credentialsId: 'GIT_SSH_KEY'
+      checkout([$class: 'GitSCM', branches: [[name: '$CI_SCRIPTS_BRANCH']], userRemoteConfigs: [[credentialsId: 'GIT_SSH_KEY', url: '$CI_SCRIPTS_REPO']]])
     }
     commentInWorkspace(comment)
   }