X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Ftemplate_lava_job.jinja2;h=878da10a381749ee237a20e8863ae7d19f41eef8;hb=6b35e57c434006884c10febcd85f8e77b66ae13d;hp=75f7b60e7812dc880cec20004b5e1304ccc713ff;hpb=9665810d17edbfb3b5f89250645cae01d1ec4792;p=lttng-ci.git

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 75f7b60..878da10 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -1,4 +1,4 @@
-device_type: {{ device_type }}
+device_type: x86
 job_name: {{ job_name }}
 timeouts:
   job:
@@ -7,10 +7,12 @@ priority: medium
 visibility: public
 {% if device_type == DeviceType.kvm %}
 context:
-  # tell the qemu template which architecture is being tested
-  # the template uses that to ensure that qemu-system-x86_64 is executed.
-  {# Used amd64 as a default #}
-  arch: amd64
+  extra_kernel_args: cpuidle.off=1
+  extra_nfsroot_args: ",nfsvers=3 nfsrootdebug"
+  lava_test_sh_cmd: "/bin/bash"
+
+tags:
+  - qemu
 {% endif %}
 {% if device_type == DeviceType.x86 %}
 tags:
@@ -32,36 +34,20 @@ actions:
         kernel:
           url: {{ kernel_url }}
           type: zimage
-        modules:
-          url: {{ linux_modules_url }}
-          archive: tar
-          compression: gz
         modules:
           url: {{ lttng_modules_url }}
-          archive: tar
           compression: gz
         nfsrootfs:
           url: {{ nfsrootfs_url }}
           compression: gz
-        os: ubuntu
 
     - boot:
         timeout:
           minutes: 10
-      {% if device_type == DeviceType.x86 %}
         method: ipxe
-        commands: ramdisk
+        commands: nfs
         prompts:
           - 'root@linaro-server:~#'
-      {% elif device_type == DeviceType.kvm %}
-        method: qemu-nfs
-        media: nfs
-        auto_login:
-          login_prompt: "kvm02 login:"
-          username: root
-        prompts:
-          - 'linaro-test'
-      {% endif %}
 
     - test:
         definitions:
@@ -105,44 +91,64 @@ actions:
               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
               from: git
               path: lava/system-tests/perf-tests.yml
               name: perf-tests
+              params:
+                JENKINS_BUILD_ID: {{ jenkins_build_id }}
           {% elif test_type == TestType.kvm_tests %}
             - repository: https://github.com/lttng/lttng-ci.git
               from: git
               path: lava/system-tests/kernel-tests.yml
               name: kernel-tests
+              params:
+                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:
+                JENKINS_BUILD_ID: {{ jenkins_build_id }}
           {% elif test_type == TestType.kvm_fuzzing_tests %}
             - repository: https://github.com/lttng/lttng-ci.git
               from: git