X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Ftemplate_lava_job.jinja2;h=d47ad11557da571d7a76e4c20629cdf318f62a77;hb=afd608b2300c98996323e1801fdc3578aecc0430;hp=7cadfd7a877b8f93cf91b60577619c85c43b5925;hpb=4e9d92412f9615a419e17d6c7da302727c774175;p=lttng-ci.git

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 7cadfd7..d47ad11 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:
@@ -59,7 +59,12 @@ actions:
 
     - test:
         definitions:
-            # Base setup of environment #
+            # Base setup #
+            - repository: https://github.com/lttng/lttng-ci.git
+              from: git
+              path: lava/system-tests/setup.yml
+              name: x86-env-setup
+            # Base vlttng setup #
             - repository:
                 metadata:
                     format: Lava-Test Test Definition 1.0
@@ -71,80 +76,25 @@ actions:
                       - x86
                 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
                     - {{ vlttng_cmd }}
                     - ln -s {{ vlttng_path }} /root/lttngvenv
                     - sync
               from: inline
-              name: x86-env-setup-inline
+              name: vlttng-env-setup-inline
               path: inline/x86-env-setup.yaml
-          {% if test_type == TestType.baremetal_benchmarks %}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-close.yml
-              name: failing-close
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-ioctl.yml
-              name: failing-ioctl
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-open-efault.yml
-              name: failing-open-efault
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/success-dup-close.yml
-              name: success-dup-close
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/raw-syscall-getpid.yml
-              name: raw-syscall-getpid
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-open-enoent.yml
-              name: failing-open-enoent
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/lttng-test-filter.yml
-              name: lttng-test-filter
-              params:
-                JENKINS_BUILD_ID: {{ jenkins_build_id }}
-          {% elif test_type == TestType.baremetal_tests %}
+          {% if test_type == TestType.baremetal_tests %}
             - repository: https://github.com/lttng/lttng-ci.git
               from: git
               path: lava/system-tests/perf-tests.yml
               name: perf-tests
               params:
+                LTTNG_VERSION_STRING: {{ lttng_version_string }}
                 JENKINS_BUILD_ID: {{ jenkins_build_id }}
           {% elif test_type == TestType.kvm_tests %}
             - repository: https://github.com/lttng/lttng-ci.git
@@ -152,11 +102,13 @@ actions:
               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
               from: git
               path: lava/system-tests/destructive-tests.yml
               name: destructive-tests
               params:
+                LTTNG_VERSION_STRING: {{ lttng_version_string }}
                 JENKINS_BUILD_ID: {{ jenkins_build_id }}
           {% endif %}