X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Ftemplate_lava_job.jinja2;h=5aaece84c9fc07eae4617f2e2cee6029a4504170;hb=ffdc5a600570d41261be985940cc657c2f4f7fa4;hp=1e8472535e1fdb280b4f5a5b1f94a1206aae144d;hpb=c75b2594dfc6b0d0b80e6946292c4647904a4eff;p=lttng-ci.git

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 1e84725..5aaece8 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
@@ -27,9 +30,6 @@ tags:
 
 metadata:
   jenkins_jobname: {{ job_name }}
-{% if test_type == TestType.kvm_fuzzing_tests %}
-  nb_iterations: {{ kprobe_round_nb }}
-{% endif %}
 
 
 actions:
@@ -62,120 +62,70 @@ 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:
                       - 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
-                  {% if test_type != TestType.kvm_fuzzing_tests %}
-                    - pip3 install --upgrade pip
-                    - hash -r
-                    - pip3 install vlttng
                     - {{ vlttng_cmd }}
                     - ln -s {{ vlttng_path }} /root/lttngvenv
                     - sync
-                  {% endif %}
               from: inline
-              name: x86-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 %}
-            - repository: https://github.com/lttng/lttng-ci.git
+              name: vlttng-env-setup-inline
+              path: inline/vlttng-env-setup
+          {% if test_type == TestType.baremetal_tests %}
+            - 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 }}
+            - repository: {{ ci_repo }}
               from: git
+              branch: {{ ci_branch }}
               path: lava/system-tests/destructive-tests.yml
               name: destructive-tests
               params:
+                LTTNG_VERSION_STRING: {{ lttng_version_string }}
                 JENKINS_BUILD_ID: {{ jenkins_build_id }}
-          {% elif test_type == TestType.kvm_fuzzing_tests %}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/kprobe-fuzzing-generate-data.yml
-              name: kprobe-fuzzing-generate-data
-              params:
-                RANDOM_SEED: {{ random_seed }}
-          {% for i in range(kprobe_round_nb) %}
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/kprobe-fuzzing-tests.yml
-              name: kprobe-fuzzing-tests{{ i }}
-              params:
-                ROUND_NB: {{ i }}
-          {% endfor %}
+                CI_REPO: {{ ci_repo }}
+                CI_BRANCH: {{ ci_branch }}
           {% endif %}