From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 16 Jul 2015 19:46:23 +0000 (-0400)
Subject: Use parent name instead of task name
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=28496f012e0bf1ebc0472a38c16594ab0ed8ea5a;p=lttng-ci.git

Use parent name instead of task name

Matrix configuration store the main name into it's parent not the configuration
task.
---

diff --git a/dsl/kernel-lttng-modules.seed.groovy b/dsl/kernel-lttng-modules.seed.groovy
index 723b5e0..f7af649 100644
--- a/dsl/kernel-lttng-modules.seed.groovy
+++ b/dsl/kernel-lttng-modules.seed.groovy
@@ -297,18 +297,17 @@ while (toBuild.size() != 0) {
 	// Throttle the build with both the number of current parent task and queued
 	// task.Look for both kernel and downstream module from previous kernel.
 	def queuedTask = q.getItems().findAll {
-		it.task.name.startsWith(jobStartWithKernel) ||
-		it.task.name.startsWith(jobStartWithModule)
+		(it.task.getParent().name.startsWith(jobStartWithKernel)) ||
+		(it.task.getParent().name.startsWith(jobStartWithModule))
 	}
-
 	if ((ongoingBuild.size() <= kernelEnabledNode.intdiv(2)) && (queuedTask.size() < limitQueue)) {
 		def job = toBuild.pop()
 		ongoingBuild.push(job.scheduleBuild2(0))
 		println "\\t trigering " + HyperlinkNote.encodeTo('/' + job.url, job.fullDisplayName)
 	} else {
 		println "Currently " + ongoingBuild.size() + " build currently on execution. Limit: " + kernelEnabledNode.intdiv(2)
-		println "Currently " + queuedTask.findAll{it.task.name.startsWith(jobStartWithModule)}.size() + " module jobs are queued. Limit: " + limitQueue
-		println "Currently " + queuedTask.findAll{it.task.name.startsWith(jobStartWithKernel)}.size() + " kernel jobs are queued. Limit: " + limitQueue
+		println "Currently " + queuedTask.findAll{it.task.getParent().name.startsWith(jobStartWithModule)}.size() + " module jobs are queued. Limit: " + limitQueue
+		println "Currently " + queuedTask.findAll{it.task.getParent().name.startsWith(jobStartWithKernel)}.size() + " kernel jobs are queued. Limit: " + limitQueue
 		Thread.sleep(random.nextInt(60000))
 		ongoingBuild.removeAll{ it.isCancelled() || it.isDone() }
 	}