X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Ftemplate_lava_job.jinja2;h=06ec835992391506d0a665131e4aa809901191e9;hb=f2d2579b10011e27ec30609d0aa666373e96e8a9;hp=b720f2030130a3850513c5741d8546b96d155f80;hpb=523e784d86f8e0dfe8be50c31cf06f6c9918d349;p=lttng-ci.git

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index b720f20..06ec835 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -2,9 +2,9 @@ device_type: x86
 job_name: {{ job_name }}
 timeouts:
   job:
-    hours: 3
+    hours: 5
   action:
-    hours: 3
+    hours: 5
   connection:
     minutes: 4
   connections:
@@ -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
@@ -59,61 +62,77 @@ actions:
 
     - test:
         definitions:
-            # Base setup of environment #
+            # Base setup #
+            - 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:
                     format: Lava-Test Test Definition 1.0
-                    name: x86-env-setup
-                    description: "Basic environment setup for x86 board"
+                    name: vlttng-env-setup
+                    description: "Configure virtualenv for vlttng"
                     os:
+                      - debian
                       - ubuntu
                     devices:
                       - x86
+                      - kvm
                 run:
                   steps:
-                    - chmod 755 /
-                    - systemctl start systemd-timesyncd
-                    - echo nameserver 172.18.0.12 > /etc/resolv.conf
-                    - ip a
-                    - groupadd tracing
                   {% if device_type == DeviceType.x86 %}
                     - mount /dev/sda1 /tmp
                   {% elif device_type == DeviceType.kvm %}
                     - mount /dev/sda /tmp
                   {% endif %}
                     - rm -rf /tmp/*
-                    - depmod -a
-                    - locale-gen en_US.UTF-8
-                    - apt-get update
-                    - apt-get upgrade
-                    - apt-get install -y systemtap-sdt-dev
-                    - pip3 install --upgrade pip
-                    - hash -r
-                    - pip3 install vlttng
+                    # 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
               from: inline
-              name: x86-env-setup-inline
-              path: inline/x86-env-setup.yaml
+              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 }}