From: George Joseph <gjoseph@digium.com>
Date: Wed, 11 Jul 2018 20:55:55 +0000 (-0600)
Subject: CI: Remove duplicate checkout
X-Git-Tag: 13.23.0-rc1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df67a98938095987c04367de0aa7a8aff73de17b;p=thirdparty%2Fasterisk.git

CI: Remove duplicate checkout

Change-Id: If5f925b4c4ed7000b153f3ed8386ce2140c886f8
---

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}") {