ci/lava: Provide LAVA rootfs URL directly

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31882>
This commit is contained in:
Daniel Stone
2024-08-29 00:12:18 +01:00
committed by Marge Bot
parent 2b3839c9c7
commit f32a2de26d
7 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -47,7 +47,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
submit \
--dump-yaml \
--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
--rootfs-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \
--rootfs-url "https://${BASE_SYSTEM_HOST_PATH}/lava-rootfs.tar.zst" \
--kernel-url-prefix "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}" \
--kernel-external "${EXTERNAL_KERNEL_TAG}" \
--build-url "${ARTIFACT_URL}" \
+1 -1
View File
@@ -412,7 +412,7 @@ class LAVAJobSubmitter(PathResolver):
lava_tags: str = "" # Comma-separated LAVA tags for the job
mesa_job_name: str = "mesa_ci_job"
pipeline_info: str = ""
rootfs_url_prefix: str = None
rootfs_url: str = None
validate_only: bool = False # Whether to only validate the job, not execute it
visibility_group: str = None # Only affects LAVA farm maintainers
job_rootfs_overlay_url: str = None
+1 -1
View File
@@ -62,7 +62,7 @@ class LAVAJobDefinition:
"""
args = self.job_submitter
nfsrootfs = {
"url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
"url": f"{args.rootfs_url}",
"compression": "zstd",
"format": "tar",
"overlays": {
@@ -22,7 +22,7 @@ actions:
minutes: 10
to: nfs
nfsrootfs:
url: None/lava-rootfs.tar.zst
url: None
compression: zstd
format: tar
overlays:
@@ -22,7 +22,7 @@ actions:
minutes: 10
to: nfs
nfsrootfs:
url: None/lava-rootfs.tar.zst
url: None
compression: zstd
format: tar
overlays:
@@ -25,7 +25,7 @@ actions:
kernel:
url: None/None
nfsrootfs:
url: None/lava-rootfs.tar.zst
url: None
compression: zstd
format: tar
overlays:
@@ -25,7 +25,7 @@ actions:
kernel:
url: None/None
nfsrootfs:
url: None/lava-rootfs.tar.zst
url: None
compression: zstd
format: tar
overlays: