jjb/lava: Parameterize repo URL and branch for test scripts

[lttng-ci.git] / jobs / system-tests.yaml

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index bb7c6cfce3011fec2d4441a6ce8b7632a37aed3a..32298e57b64d842fa6194cbdb202c0a85aadd39e 100644 (file)
--- 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,18 @@
           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_xenial_2018-12-05.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'
 
 - publisher:
     name: 'system_tests_email_ext_default'
@@ -94,11 +106,15 @@
           properties-content: |
             BUILD_DEVICE=kvm
             LTTNG_VERSION={lttngversion}
+            LTTNG_CI_REPO=${{LTTNG_CI_REPO}}
+            LTTNG_CI_BRANCH=${{LTTNG_CI_BRANCH}}
 
     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
@@ -168,11 +184,15 @@
           properties-content: |
             BUILD_DEVICE=baremetal
             LTTNG_VERSION={lttngversion}
+            LTTNG_CI_REPO=${{LTTNG_CI_REPO}}
+            LTTNG_CI_BRANCH=${{LTTNG_CI_BRANCH}}
 
     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
@@ -235,6 +255,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:
@@ -251,8 +279,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