Skip to content

lava: Install the kselftest tarball using an overlay #2840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions config/runtime/base/lava.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,22 @@ actions:

{% set test_template = 'tests/' + test_method + '.jinja2' %}
{% extends test_template %}

# If we built the kselftests always run the devices/error_logs test to
# flag up any errors that were triggered while running the main tests.
{%- if node.artifacts.kselftest_tar_gz %}
- test:
timeout:
minutes: 1
definitions:
- repository: https://github.com/kernelci/test-definitions.git
from: git
revision: kernelci.org
path: automated/linux/kselftest/kselftest.yaml
name: '{{ node.name }}'
parameters:
KSELFTEST_PATH: /opt/kselftest
SKIPFILE: /dev/null
TST_CMDFILES: devices/error_logs
SKIP_INSTALL: True
{%- endif %}
9 changes: 9 additions & 0 deletions config/runtime/boot/depthcharge.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,16 @@
{%- if boot_commands == 'nfs' and nfsroot %}
nfsrootfs:
compression: xz
format: tar
url: '{{ nfsroot }}/full.rootfs.tar.xz'
{%- if node.artifacts.kselftest_tar_gz %}
overlays:
kselftest:
url: {{ node.artifacts.kselftest_tar_gz }}
compression: gz
format: tar
path: /opt/kselftest
{%- endif %}
ramdisk:
compression: gz
url: '{{ nfsroot }}/initrd.cpio.gz'
Expand Down
8 changes: 8 additions & 0 deletions config/runtime/boot/fastboot.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
format: tar
path: /
{% set dtb = device_dtb.split('/')[-1] %}
{%- if node.artifacts.kselftest_tar_gz %}
kselftest:
url: {{ node.artifacts.kselftest_tar_gz }}
compression: gz
format: tar
path: /opt/kselftest
{%- endif %}

postprocess:
docker:
image: ghcr.io/mwasilew/docker-mkbootimage:master
Expand Down
9 changes: 9 additions & 0 deletions config/runtime/boot/grub.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
{%- if boot_commands == 'nfs' %}
nfsrootfs:
url: '{{ nfsroot }}/full.rootfs.tar.xz'
format: tar
compression: xz
{%- if node.artifacts.kselftest_tar_gz %}
overlays:
kselftest:
url: {{ node.artifacts.kselftest_tar_gz }}
compression: gz
format: tar
path: /opt/kselftest
{%- endif %}
ramdisk:
url: '{{ nfsroot }}/initrd.cpio.gz'
compression: gz
Expand Down
9 changes: 9 additions & 0 deletions config/runtime/boot/u-boot.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,16 @@
{%- if boot_commands == 'nfs' %}
nfsrootfs:
url: '{{ nfsroot }}/full.rootfs.tar.xz'
format: tar
compression: xz
{%- if node.artifacts.kselftest_tar_gz %}
overlays:
kselftest:
url: {{ node.artifacts.kselftest_tar_gz }}
compression: gz
format: tar
path: /opt/kselftest
{%- endif %}
ramdisk:
url: '{{ nfsroot }}/initrd.cpio.gz'
compression: gz
Expand Down
2 changes: 1 addition & 1 deletion config/runtime/tests/kselftest-platform-parameters.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
path: automated/linux/kselftest/kselftest.yaml
name: '{{ node.name }}'
parameters:
TESTPROG_URL: '{{ node.artifacts.kselftest_tar_gz }}'
KSELFTEST_PATH: /opt/kselftest
SKIPFILE: /dev/null
TST_CMDFILES: '{{ collections }}'
TST_CASENAME: '{{ tests }}'
Expand Down
2 changes: 1 addition & 1 deletion config/runtime/tests/kselftest.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
path: automated/linux/kselftest/kselftest.yaml
name: '{{ node.name }}'
parameters:
TESTPROG_URL: '{{ node.artifacts.kselftest_tar_gz }}'
KSELFTEST_PATH: /opt/kselftest
SKIPFILE: {{ skipfile if skipfile else '/dev/null' }}
TST_CMDFILES: '{{ collections }}'
TST_CASENAME: '{{ tests }}'
Expand Down