X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Ftemplate_lava_job.jinja2;h=b720f2030130a3850513c5741d8546b96d155f80;hb=51c9c62db1805a4cdd96be18df4082f1ac5d81c5;hp=8d9f02595a27273a477af03b2a876635b2547d42;hpb=35b46f08b27c975edad28479469459155d32aea5;p=lttng-ci.git

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 8d9f025..b720f20 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -2,15 +2,21 @@ device_type: x86
 job_name: {{ job_name }}
 timeouts:
   job:
-    hours: 2
+    hours: 3
+  action:
+    hours: 3
+  connection:
+    minutes: 4
+  connections:
+    lava-test-shell:
+      minutes: 4
 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"
+
+{% if device_type == DeviceType.kvm %}
 tags:
   - qemu
 {% endif %}
@@ -21,9 +27,6 @@ tags:
 
 metadata:
   jenkins_jobname: {{ job_name }}
-{% if test_type == TestType.kvm_fuzzing_tests %}
-  nb_iterations: {{ kprobe_round_nb }}
-{% endif %}
 
 
 actions:
@@ -36,18 +39,21 @@ actions:
           type: zimage
         modules:
           url: {{ lttng_modules_url }}
-          archive: tar
           compression: gz
         nfsrootfs:
           url: {{ nfsrootfs_url }}
           compression: gz
-        os: ubuntu
 
     - boot:
         timeout:
           minutes: 10
         method: ipxe
         commands: nfs
+        auto_login:
+          login_prompt: 'login:'
+          username: root
+          password_prompt: 'Password:'
+          password: root
         prompts:
           - 'root@linaro-server:~#'
 
@@ -65,85 +71,49 @@ actions:
                       - x86
                 run:
                   steps:
-                    - cat /etc/resolv.conf
+                    - 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
-                    - rm -rf /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 {{ packages|join(" ") }}
-                  {% if test_type != TestType.kvm_fuzzing_tests %}
+                    - 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
-                  {% 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
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-ioctl.yml
-              name: failing-ioctl
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-open-efault.yml
-              name: failing-open-efault
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/success-dup-close.yml
-              name: success-dup-close
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/raw-syscall-getpid.yml
-              name: raw-syscall-getpid
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/failing-open-enoent.yml
-              name: failing-open-enoent
-            - repository: https://github.com/lttng/lttng-ci.git
-              from: git
-              path: lava/system-tests/lttng-test-filter.yml
-              name: lttng-test-filter
-          {% 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:
+                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
-          {% 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
               params:
-                ROUND_NB: {{ i }}
-          {% endfor %}
+                JENKINS_BUILD_ID: {{ jenkins_build_id }}
           {% endif %}