X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Ftemplate_lava_job.jinja2;h=b3b9c1e2aa9b1270f48fc7df58eaf1e665b71607;hb=9db5ccdf2b28c450c15a5dc6051d3bbf41d850ff;hp=c7ac308a941e682ed6116b7f431ba72d4bab477f;hpb=33f6fe5611d1346ac37339aded8ebca70fa894de;p=lttng-ci.git

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index c7ac308..b3b9c1e 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: 2
+    hours: 3
   action:
-    hours: 2
+    hours: 3
   connection:
     minutes: 4
   connections:
@@ -15,7 +15,6 @@ visibility: public
 context:
   extra_kernel_args: cpuidle.off=1
   extra_nfsroot_args: ",nfsvers=3 nfsrootdebug"
-  lava_test_sh_cmd: "/bin/bash"
 
 {% if device_type == DeviceType.kvm %}
 tags:
@@ -28,9 +27,6 @@ tags:
 
 metadata:
   jenkins_jobname: {{ job_name }}
-{% if test_type == TestType.kvm_fuzzing_tests %}
-  nb_iterations: {{ kprobe_round_nb }}
-{% endif %}
 
 
 actions:
@@ -53,6 +49,11 @@ actions:
           minutes: 10
         method: ipxe
         commands: nfs
+        auto_login:
+          login_prompt: 'login:'
+          username: root
+          password_prompt: 'Password:'
+          password: root
         prompts:
           - 'root@linaro-server:~#'
 
@@ -70,73 +71,32 @@ 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 %}
-                    - pip3 install --upgrade pip
+                    - apt-get install -y systemtap-sdt-dev
+                    - pip3 install 'pip==20.3'
                     - 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 %}
+          {% if test_type == TestType.baremetal_tests %}
             - repository: https://github.com/lttng/lttng-ci.git
               from: git
               path: lava/system-tests/perf-tests.yml
@@ -156,19 +116,4 @@ actions:
               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
-              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 %}
           {% endif %}