From c17a93f36a65302f16afbd61ed0043c5a108a574 Mon Sep 17 00:00:00 2001
From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Tue, 7 Apr 2020 15:32:27 -0400
Subject: [PATCH] jjb: replace usage of `defaults` by `job-template`

This seems more appropriate and allows for usage of parameters such as
`lttngversion`. We will use `lttngversion` in a following commit.

This change also renames the canary jobs are renamed such as
`vm_tests_canary` -> `vm_tests_kcanary_lcanary`. I did that to
simply the templates.

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
---
 jobs/system-tests.yaml                     | 46 +++++-----------------
 scripts/system-tests/system-trigger.groovy |  4 +-
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 6ed6382..b42c139 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -62,9 +62,9 @@
           send-to:
             - recipients
 
-## Defaults
-- defaults:
-    name: baremetal_benchmarks
+## Templates
+- job-template:
+    name: baremetal_benchmarks_k{kversion}_l{lttngversion}
     description: |
       Runs baremetal kernel benchmarks over different combination of kernel and lttng configurations.
     project-type: freestyle
@@ -126,8 +126,8 @@
           includes: '*.png'
       - workspace-cleanup
 
-- defaults:
-    name: vm_tests
+- job-template:
+    name: vm_tests_k{kversion}_l{lttngversion}
     description: |
       Runs root_regression and root_destructive_tests on a virtual machine over different combinations of kernel and lttng configurations.
     project-type: freestyle
@@ -176,8 +176,8 @@
     publishers:
       - workspace-cleanup
 
-- defaults:
-    name: baremetal_tests
+- job-template:
+    name: baremetal_tests_k{kversion}_l{lttngversion}
     description: |
       Runs perf_regression tests on a baremetal machine over different combinations of kernel and lttng configurations.
     project-type: freestyle
@@ -227,7 +227,6 @@
     publishers:
       - workspace-cleanup
 
-## Templates
 - job-template:
     name: build_kernel_PARAM
     description: |
@@ -362,35 +361,16 @@
     publishers:
       - system_tests_email_ext_default
 
-- job-template:
-    name: baremetal_benchmarks_k{kversion}_l{lttngversion}
-    defaults: baremetal_benchmarks
-- job-template:
-    name: vm_tests_k{kversion}_l{lttngversion}
-    defaults: vm_tests
-- job-template:
-    name: baremetal_tests_k{kversion}_l{lttngversion}
-    defaults: baremetal_tests
+## Project
 
 # Canary jobs are made to confirm that the whole Lava pipeline is working.
 # They are scheduled once a day always on the same (LTTng, Kernel) code. If any
 # of those jobs fails, it means that there is an issue with the configuration
-- job-template:
-    name: baremetal_benchmarks_canary
-    defaults: baremetal_benchmarks
-
-- job-template:
-    name: baremetal_tests_canary
-    defaults: baremetal_tests
 
-- job-template:
-    name: vm_tests_canary
-    defaults: vm_tests
-
-## Project
 - project:
     name: system-tests
     kversion:
+      - canary
       - master
       - linux-4.4.y
       - linux-4.9.y
@@ -399,6 +379,7 @@
       - linux-5.0.y
       - linux-5.1.y
     lttngversion:
+      - canary
       - master
       - stable-2.9
       - stable-2.10
@@ -421,13 +402,6 @@
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
 
-- project:
-    name: system-tests-canary
-    jobs:
-      - 'vm_tests_canary'
-      - 'baremetal_tests_canary'
-      - 'baremetal_benchmarks_canary'
-
 - project:
     name: system-general
     test_type:
diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index a4e4165..0fedc26 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -385,7 +385,7 @@ configurationOfInterest.each { lttngBr, linuxBr  ->
 }
 
 //Add canary job
-def jobNameCanary = jobType + "_canary";
+def jobNameCanary = jobType + "_kcanary_lcanary";
 currentJobs[jobNameCanary] = [:];
 currentJobs[jobNameCanary]['config'] = [:];
 currentJobs[jobNameCanary]['config']['linuxBranch'] = 'v4.4.194';
@@ -408,7 +408,7 @@ def ongoingJobs = 0;
 currentJobs.each { jobName, jobInfo ->
   // If the job ran in the past, we check if the IDs changed since.
   // Fetch past results only if the job is not of type canary.
-  if (!jobName.contains('_canary') && pastJobs.containsKey(jobName) &&
+  if (!jobName.contains('_kcanary_lcanary') && pastJobs.containsKey(jobName) &&
          build.getBuildVariables().get('FORCE_JOB_RUN') == 'false') {
     pastJob = pastJobs[jobName];
 
-- 
2.34.1