X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=jobs%2Fsystem-tests.yaml;h=6a27dc3979a6d64de8bfb2d3a3a4fdf7fce895ce;hb=61c06a247a0a0bbf646f3233969107b866de22b7;hp=ee48c82a172cedaa2b461b5534dfa8a81439f65a;hpb=7bacdf9e26fcf3f8dc8b33768278e266df27cb2c;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index ee48c82..6a27dc3 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -1,6 +1,6 @@
 ---
 ## Anchors
-- system_tests_parameters_defaults: &system_tests_parameters_defaults
+- _system_tests_parameters_defaults: &system_tests_parameters_defaults
     name: 'system_tests_parameters_defaults'
     parameters:
       - string:
@@ -35,6 +35,28 @@
           name: 'LTTNG_UST_REPO'
           default: 'https://github.com/lttng/lttng-ust.git'
           description: 'LTTng-UST git repo to checkout the UST id'
+      - string:
+          name: 'ROOTFS_URL'
+          default: 'https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_jammy_2023-05-18.tar.gz'
+          description: 'The URL at which the system root FS can be downloaded'
+      - string:
+          name: 'LTTNG_CI_REPO'
+          default: 'https://github.com/lttng/lttng-ci.git'
+          description: 'LTTng-ci git repo to checkout the CI scripts'
+      - string:
+          name: 'LTTNG_CI_BRANCH'
+          default: 'master'
+          description: 'The branch of the CI repository to clone for job scripts'
+      - string:
+          name: 'LAVA_HOST'
+          default: 'lava-master-03.internal.efficios.com'
+          description: 'The hostname of the LAVA instance'
+      - choice:
+          name: 'LAVA_PROTO'
+          choices:
+            - 'http'
+            - 'https'
+          description: 'The protocol to use with the LAVA host'
 
 - publisher:
     name: 'system_tests_email_ext_default'
@@ -94,11 +116,17 @@
           properties-content: |
             BUILD_DEVICE=kvm
             LTTNG_VERSION={lttngversion}
+            LTTNG_CI_REPO=${{LTTNG_CI_REPO}}
+            LTTNG_CI_BRANCH=${{LTTNG_CI_BRANCH}}
+            LAVA_HOST=${{LAVA_HOST}}
+            LAVA_PROTO=${{LAVA_PROTO}}
 
     scm:
       - git:
-          url: https://github.com/lttng/lttng-ci
+          url: "${{LTTNG_CI_REPO}}"
           basedir: src/lttng-ci/
+          branches:
+            - "${{LTTNG_CI_BRANCH}}"
 
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
@@ -146,6 +174,7 @@
     properties:
       - build-discarder:
           num-to-keep: 10
+          artifact-num-to-keep: 2
       - throttle:
           max-total: 2
           option: 'category'
@@ -167,11 +196,16 @@
           properties-content: |
             BUILD_DEVICE=baremetal
             LTTNG_VERSION={lttngversion}
-
+            LTTNG_CI_REPO=${{LTTNG_CI_REPO}}
+            LTTNG_CI_BRANCH=${{LTTNG_CI_BRANCH}}
+            LAVA_HOST=${{LAVA_HOST}}
+            LAVA_PROTO=${{LAVA_PROTO}}
     scm:
       - git:
-          url: https://github.com/lttng/lttng-ci
+          url: "${{LTTNG_CI_REPO}}"
           basedir: src/lttng-ci/
+          branches:
+            - "${{LTTNG_CI_BRANCH}}"
 
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
@@ -234,6 +268,14 @@
       - string:
           name: 'S3_STORAGE_LTTNG_MODULES'
           description: 'Path to store the LTTng Modules'
+      - string:
+          name: 'LTTNG_CI_REPO'
+          default: 'https://github.com/lttng/lttng-ci.git'
+          description: 'LTTng-ci git repo to checkout the CI scripts'
+      - string:
+          name: 'LTTNG_CI_BRANCH'
+          default: 'master'
+          description: 'The branch of the CI repository to clone for job scripts'
 
     properties:
       - build-discarder:
@@ -250,8 +292,10 @@
 
     scm:
       - git:
-          url: https://github.com/lttng/lttng-ci
+          url: "${{LTTNG_CI_REPO}}"
           basedir: src/lttng-ci/
+          branches:
+            - "${{LTTNG_CI_BRANCH}}"
 
     builders:
       - shell: !include-raw-escape: scripts/system-tests/checkout-modules.sh
@@ -331,7 +375,6 @@
       - master
     lttngversion:
       - master
-      - stable-2.12
       - stable-2.13
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
@@ -350,21 +393,36 @@
       - linux-5.10.y
       - linux-5.15.y
       - linux-5.16.y
+      - linux-6.1.y
     lttngversion:
       - canary
       - master
-      - stable-2.12
       - stable-2.13
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
       - 'baremetal_tests_k{kversion}_l{lttngversion}'
+- project:
+    name: system-tests-2.12
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
+    kversion:
+      - linux-4.9.y
+      - linux-4.14.y
+      - linux-4.19.y
+      - linux-5.4.y
+      - linux-5.10.y
+      - linux-5.15.y
+      - linux-5.16.y
+    lttngversion:
+      - stable-2.12
+    jobs:
+      - 'vm_tests_k{kversion}_l{lttngversion}'
+      - 'baremetal_tests_k{kversion}_l{lttngversion}'
 - project:
     name: system-tests-vm-only
     email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     kversion:
       - linux-3.18.y
     lttngversion:
-      - master
       - stable-2.12
       - stable-2.13
     jobs: