Merge "ansible/lava: Add role for lava server"

[lttng-ci.git] / scripts / system-tests / template_lava_job.jinja2

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 95ec1eb6f6908d8b5f60bacb10a4ddbd2611576d..5aaece84c9fc07eae4617f2e2cee6029a4504170 100644 (file)
--- 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
@@ -60,20 +63,25 @@ actions:
     - test:
         definitions:
             # Base setup #
-            - repository: https://github.com/lttng/lttng-ci.git
+            - 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:
                   {% if device_type == DeviceType.x86 %}
@@ -86,29 +94,38 @@ actions:
                     - ln -s {{ vlttng_path }} /root/lttngvenv
                     - sync
               from: inline
-              name:vlttng-env-setup-inline
-              path: inline/x86-env-setup.yaml
+              name: vlttng-env-setup-inline
+              path: inline/vlttng-env-setup
           {% if test_type == TestType.baremetal_tests %}
-            - repository: https://github.com/lttng/lttng-ci.git
+            - 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 }}
+                CI_REPO: {{ ci_repo }}
+                CI_BRANCH: {{ ci_branch }}
           {% endif %}