From b2105fe162b41a58702f13b029934b4f7e22e3cb Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Thu, 23 Jan 2025 08:53:44 +0100 Subject: [PATCH] ci/lava: Allow passing extra cmdline arguments The LAVA_CMDLINE variable is appended to extra_nfsroot_args. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/lava/utils/lava_job_definition.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci/lava/utils/lava_job_definition.py b/.gitlab-ci/lava/utils/lava_job_definition.py index 55cd30d4b7c..2bc4081b4d6 100644 --- a/.gitlab-ci/lava/utils/lava_job_definition.py +++ b/.gitlab-ci/lava/utils/lava_job_definition.py @@ -3,6 +3,8 @@ from typing import TYPE_CHECKING, Any from ruamel.yaml import YAML +from os import environ, getenv + from lava.utils.lava_farm import LavaFarm, get_lava_farm from lava.utils.ssh_job_definition import ( generate_docker_test, @@ -38,6 +40,9 @@ class LAVAJobDefinition: self.lava_nfs_args: str = "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard,v3 ip=dhcp" # extra_nfsroot_args appends to cmdline self.extra_nfsroot_args: str = " init=/init rootwait usbcore.quirks=0bda:8153:k" + # Append LAVA_CMDLINE to extra_nfsroot_args + if lava_cmdline := getenv('LAVA_CMDLINE'): + self.extra_nfsroot_args += f" {lava_cmdline}" def has_ssh_support(self) -> bool: if FORCE_UART: