ci/lava: Allow passing extra cmdline arguments
The LAVA_CMDLINE variable is appended to extra_nfsroot_args. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33282>
This commit is contained in:
committed by
Marge Bot
parent
9950dfcd80
commit
b2105fe162
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user