From ce4c29fc40d6f1fe419d460c5c29779fa2b32de5 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Wed, 11 Jul 2018 14:55:55 -0600 Subject: [PATCH] CI: Remove duplicate checkout Change-Id: If5f925b4c4ed7000b153f3ed8386ce2140c886f8 --- tests/CI/gates.jenkinsfile | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile index 6f489a7894..30b534a562 100644 --- a/tests/CI/gates.jenkinsfile +++ b/tests/CI/gates.jenkinsfile @@ -42,6 +42,10 @@ pipeline { onUnstable: false ] } + options { + skipDefaultCheckout true + } + agent { /* All of the stages need to be performed on a docker host */ label "swdev-docker" @@ -63,12 +67,6 @@ pipeline { sh "sudo chown -R jenkins:users ." /* - * Jenkins has already automatically checked out the base branch - * for this change but we now need to check out the change itself - * and rebase it on the current base branch. If the rebase fails, - * that's an indication to the user that they'll need to sort their - * change out. - * * The Gerrit Trigger provides all the URLs and refspecs to * check out the change. */ @@ -116,17 +114,17 @@ pipeline { def parallelTasks = [ : ] for (def testGroup in testGroups) { - /* - * Because each task is a Groovy closure, we need to - * keep local references to some variables. - */ - def groupName = testGroup.name - - parallelTasks[groupName] = { + parallelTasks[testGroup.name] = { + /* + * Because each task is a Groovy closure, we need to + * keep local references to some variables. + */ + def groupName = testGroup.name + def groupDir = testGroup.dir + def groupTestcmd = testGroup.testcmd + def testsuiteUrl = env.GIT_URL.replaceAll(/${GERRIT_PROJECT}$/, "testsuite") + stage (groupName) { - def groupDir = testGroup.dir - def groupTestcmd = testGroup.testcmd - def testsuiteUrl = env.GIT_URL.replaceAll(/${GERRIT_PROJECT}$/, "testsuite") docker.image(randomImage).inside("${dockerOptions} --name ${BUILD_TAG}-${groupName}") { -- 2.47.2