lava: Use custom timeout function for make check

[lttng-ci.git] / scripts / system-tests / template_lava_job.jinja2

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index b6080066763cc7f18de914019aa6a89cbf57f779..06ec835992391506d0a665131e4aa809901191e9 100644 (file)
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -16,6 +16,9 @@ context:
   extra_kernel_args: cpuidle.off=1
   extra_nfsroot_args: ",nfsvers=3 nfsrootdebug"
 
+environment:
+  SHELL: "/bin/bash"
+
 {% if device_type == DeviceType.kvm %}
 tags:
   - qemu
@@ -60,10 +63,14 @@ actions:
     - test:
         definitions:
             # Base setup #
-            - repository: https://github.com/lttng/lttng-ci.git
+            - repository: {{ ci_repo }}
               from: git
+              branch: {{ ci_branch }}
               path: lava/system-tests/setup.yml
               name: x86-env-setup
+              params:
+                CI_REPO: {{ ci_repo }}
+                CI_BRANCH: {{ ci_branch }}
             # Base vlttng setup #
             - repository:
                 metadata:
@@ -71,6 +78,7 @@ actions:
                     name: vlttng-env-setup
                     description: "Configure virtualenv for vlttng"
                     os:
+                      - debian
                       - ubuntu
                     devices:
                       - x86
@@ -83,6 +91,12 @@ actions:
                     - mount /dev/sda /tmp
                   {% endif %}
                     - rm -rf /tmp/*
+                    # With the Debian bookwrom rootfs, without
+                    # this being set, the babeltrace2 'bt2' python
+                    # bindings are not correctly installed in the
+                    # vlttng directory.
+                    - export SETUPTOOLS_USE_DISTUTILS=stdlib
+                    - source /root/python-venv/bin/activate
                     - {{ vlttng_cmd }}
                     - ln -s {{ vlttng_path }} /root/lttngvenv
                     - sync
@@ -90,26 +104,35 @@ actions:
               name: vlttng-env-setup-inline
               path: inline/vlttng-env-setup
           {% if test_type == TestType.baremetal_tests %}
-            - repository: https://github.com/lttng/lttng-ci.git
+            - repository: {{ ci_repo }}
               from: git
+              branch: {{ ci_branch }}
               path: lava/system-tests/perf-tests.yml
               name: perf-tests
               params:
                 LTTNG_VERSION_STRING: {{ lttng_version_string }}
                 JENKINS_BUILD_ID: {{ jenkins_build_id }}
+                CI_REPO: {{ ci_repo }}
+                CI_BRANCH: {{ ci_branch }}
           {% elif test_type == TestType.kvm_tests %}
-            - repository: https://github.com/lttng/lttng-ci.git
+            - repository: {{ ci_repo }}
               from: git
+              branch: {{ ci_branch }}
               path: lava/system-tests/kernel-tests.yml
               name: kernel-tests
               params:
                 LTTNG_VERSION_STRING: {{ lttng_version_string }}
                 JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
+                CI_REPO: {{ ci_repo }}
+                CI_BRANCH: {{ ci_branch }}
+          {% endif %}
+            - repository: {{ ci_repo }}
               from: git
-              path: lava/system-tests/destructive-tests.yml
-              name: destructive-tests
+              branch: {{ ci_branch }}
+              path: lava/system-tests/upload-artifacts.yml
+              name: upload-artifacts
               params:
                 LTTNG_VERSION_STRING: {{ lttng_version_string }}
                 JENKINS_BUILD_ID: {{ jenkins_build_id }}
-          {% endif %}
+                CI_REPO: {{ ci_repo }}
+                CI_BRANCH: {{ ci_branch }}