projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: Add Linux 6.6.y to system tests
[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..ed60cf1fbe5ad68e9a3581e98ef13feb2ffb4cb4 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:
job_name: {{ job_name }}
timeouts:
job:
- hours:
3
+ hours:
5
action:
action:
- hours:
3
+ hours:
5
connection:
minutes: 4
connections:
connection:
minutes: 4
connections:
@@
-16,6
+16,9
@@
context:
extra_kernel_args: cpuidle.off=1
extra_nfsroot_args: ",nfsvers=3 nfsrootdebug"
extra_kernel_args: cpuidle.off=1
extra_nfsroot_args: ",nfsvers=3 nfsrootdebug"
+environment:
+ SHELL: "/bin/bash"
+
{% if device_type == DeviceType.kvm %}
tags:
- qemu
{% if device_type == DeviceType.kvm %}
tags:
- qemu
@@
-60,20
+63,25
@@
actions:
- test:
definitions:
# Base setup #
- test:
definitions:
# Base setup #
- - repository:
https://github.com/lttng/lttng-ci.git
+ - repository:
{{ ci_repo }}
from: git
from: git
+ branch: {{ ci_branch }}
path: lava/system-tests/setup.yml
name: x86-env-setup
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
# 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
os:
- ubuntu
devices:
- x86
+ - kvm
run:
steps:
{% if device_type == DeviceType.x86 %}
run:
steps:
{% if device_type == DeviceType.x86 %}
@@
-86,29
+94,28
@@
actions:
- ln -s {{ vlttng_path }} /root/lttngvenv
- sync
from: inline
- 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 %}
{% if test_type == TestType.baremetal_tests %}
- - repository:
https://github.com/lttng/lttng-ci.git
+ - repository:
{{ ci_repo }}
from: git
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 }}
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 %}
{% elif test_type == TestType.kvm_tests %}
- - repository:
https://github.com/lttng/lttng-ci.git
+ - repository:
{{ ci_repo }}
from: git
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 }}
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
- from: git
- 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 %}
{% endif %}
This page took
0.024417 seconds
and
4
git commands to generate.