Skip to content
Snippets Groups Projects
Commit 6c327a41 authored by Dylan Aïssi's avatar Dylan Aïssi Committed by Walter Lozano
Browse files

Use lava-runner templating to pass package name instead of hardcoding it with...

Use lava-runner templating to pass package name instead of hardcoding it with generate*jobs.py scripts

Signed-off-by: default avatarDylan Aïssi <dylan.aissi@collabora.com>
parent 70246c7d
No related branches found
No related tags found
1 merge request!596Backport v2024 <- 2025dev1: Backport improvements
......@@ -62,7 +62,6 @@ def run_generate_jobs(test_meta, args, image_type, arch, board=None):
'--metadata-file', args.output_dir + '/metadata.json',
'--output-dir', args.output_dir,
'-t', f'visibility:{args.visibility}',
'-t', f'SOURCE_PKG_NAME:{args.src_pkg}',
'-t', f'BUILD_RESULTS_URL:{args.build_url}',
'-t', f'BIN_PKG_LIST:{bin_pkg_list}',
'-t', f'PKG_TEST_CMD:{pkg_test_cmd}',
......@@ -80,8 +79,6 @@ def main():
help='os release (e.g. v2025dev1)')
parser.add_argument('--image-id', type=str,
help='image id to be used (20231211.0015)')
parser.add_argument('--src-pkg', type=str, required=True,
help='name of the source package to test')
parser.add_argument('--visibility', type=str, required=True,
help='visibility of LAVA jobs')
parser.add_argument('--build-url', type=str, required=True,
......
job_name: Run {{SOURCE_PKG_NAME}}-in-{{image_name}}
job_name: Run {% raw %}{{job.PACKAGE}}{% endraw %}-in-{{image_name}}
{% if device_type == 'qemu' %}
{% include 'common-qemu-boot-tpl.yaml' %}
{% else %}
......@@ -7,14 +7,14 @@ job_name: Run {{SOURCE_PKG_NAME}}-in-{{image_name}}
- test:
namespace: system
name: run-{{ SOURCE_PKG_NAME }}-tests
name: run-{% raw %}{{job.PACKAGE}}{% endraw %}-tests
timeout:
minutes: 15
definitions:
- repository:
metadata:
format: Lava-Test Test Definition 1.0
name: "Install {{SOURCE_PKG_NAME}} from GitLab"
name: "Install {% raw %}{{job.PACKAGE}}{% endraw %} from GitLab"
run:
steps:
- # enable development repo
......@@ -39,25 +39,25 @@ job_name: Run {{SOURCE_PKG_NAME}}-in-{{image_name}}
done
- sudo apt install ./*.deb -q -y
from: inline
path: install-{{SOURCE_PKG_NAME}}
name: install-{{SOURCE_PKG_NAME}}
path: install-{% raw %}{{job.PACKAGE}}{% endraw %}
name: install-{% raw %}{{job.PACKAGE}}{% endraw %}
- repository:
metadata:
format: Lava-Test Test Definition 1.0
name: "Run {{SOURCE_PKG_NAME}} test"
name: "Run {% raw %}{{job.PACKAGE}}{% endraw %} test"
run:
steps:
- |
curl -H "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \
-O {{BUILD_RESULTS_URL}}/artifacts-list.txt
- DEBTAR_PATH=$(grep -m 1 "{{ SOURCE_PKG_NAME }}.*\.debian\.tar\.xz$" artifacts-list.txt)
- DEBTAR_PATH=$(grep -m 1 "{% raw %}{{job.PACKAGE}}{% endraw %}.*\.debian\.tar\.xz$" artifacts-list.txt)
- |
curl -H "JOB-TOKEN: {% raw %}{{job.CI_JOB_TOKEN}}{% endraw %}" \
--output {{SOURCE_PKG_NAME}}.debian.tar.xz {{BUILD_RESULTS_URL}}/${DEBTAR_PATH}
- tar -xf {{SOURCE_PKG_NAME}}.debian.tar.xz
--output {% raw %}{{job.PACKAGE}}{% endraw %}.debian.tar.xz {{BUILD_RESULTS_URL}}/${DEBTAR_PATH}
- tar -xf {% raw %}{{job.PACKAGE}}{% endraw %}.debian.tar.xz
- mkdir -p debian/tests/
- cd debian/tests/
- {{ PKG_TEST_CMD }}
from: inline
path: run-{{ SOURCE_PKG_NAME }}-tests
name: run-{{ SOURCE_PKG_NAME }}-tests
path: run-{% raw %}{{job.PACKAGE}}{% endraw %}-tests
name: run-{% raw %}{{job.PACKAGE}}{% endraw %}-tests
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment