From 4cc3d57cf96cf5f509b16b59e5f4b5d4e1d47c2f Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 22 Dec 2017 11:56:28 -0500 Subject: [PATCH] jjb: lava: cleanup: clarify comments and fix coding style Signed-off-by: Francis Deslauriers --- scripts/system-tests/system-trigger.groovy | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy index 394227c..cc1e1ee 100644 --- a/scripts/system-tests/system-trigger.groovy +++ b/scripts/system-tests/system-trigger.groovy @@ -180,7 +180,9 @@ class RunConfiguration { } String toString() { - return "${this.linuxBranch}:{${this.linuxTagId}}, ${this.lttngBranch}:{${this.lttngModulesCommitId}, ${this.lttngToolsCommitId}, ${this.lttngUstCommitId}}" + return "${this.linuxBranch}:{${this.linuxTagId}}, ${this.lttngBranch}" + + ":{${this.lttngModulesCommitId}, ${this.lttngToolsCommitId}," + + "${this.lttngUstCommitId}}" } } @@ -376,8 +378,8 @@ linuxLastTagIds.each { linuxTag -> } } -// For each top of branch commits that were not seen before, schedule one job -// for each lttng/linux tracked configurations +// For each top of branch commits of LTTng-Tools that were not seen before, +// schedule one job for each lttng/linux tracked configurations toolsHeadCommits.each { toolsHead -> if (!oldToolsHeadCommits.contains(toolsHead.value)) { linuxLastTagIds.each { linuxTag -> @@ -394,8 +396,8 @@ toolsHeadCommits.each { toolsHead -> } } -// For each top of branch commits that were not seen before, schedule one job -// for each lttng/linux tracked configurations +// For each top of branch commits of LTTng-Modules that were not seen before, +// schedule one job for each lttng/linux tracked configurations modulesHeadCommits.each { modulesHead -> if (!oldModulesHeadCommits.contains(modulesHead.value)) { linuxLastTagIds.each { linuxTag -> @@ -412,8 +414,8 @@ modulesHeadCommits.each { modulesHead -> } } -// For each top of branch commits that were not seen before, schedule one job -// for each lttng/linux tracked configurations +// For each top of branch commits of LTTng-UST that were not seen before, +// schedule one job for each lttng/linux tracked configurations ustHeadCommits.each { ustHead -> if (!oldUstHeadCommits.contains(ustHead.value)) { linuxLastTagIds.each { linuxTag -> @@ -430,7 +432,8 @@ ustHeadCommits.each { ustHead -> } } -// Save the tag and commit IDs scheduled in the past and during this run to the workspace +// Save the tag and commit IDs scheduled in the past and during this run to the +// workspace saveCurrentIdsToWorkspace(newOldLinuxTags, linuxOnDiskPath) saveCurrentIdsToWorkspace(newOldToolsHeadCommits, toolsOnDiskPath) saveCurrentIdsToWorkspace(newOldModulesHeadCommits, modulesOnDiskPath) -- 2.34.1