ci/lava: Pass MinIO path on the command line

This brings us much closer with what bare-metal does, and also allows us
to upload job data to a local instance rather than the primary fd.o one.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11337>

diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index 5b4e698..d7e83f8 100755 (executable)
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -33,6 +33,7 @@ artifacts/lava/lava_job_submitter.py \
        --base-system-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \
        --mesa-build-url "${FDO_HTTP_CACHE_URI:-}https://${MESA_BUILD_PATH}" \
        --job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
+       --job-artifacts-base ${JOB_ARTIFACTS_BASE} \
        --device-type ${DEVICE_TYPE} \
        --dtb ${DTB} \
        --jwt "${CI_JOB_JWT}" \

diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2
index ade66ad..7889cee 100644 (file)
--- a/.gitlab-ci/lava/lava.yml.jinja2
+++ b/.gitlab-ci/lava/lava.yml.jinja2
@@ -1,7 +1,7 @@
 job_name: "mesa: {{ pipeline_info }}"
 device_type: {{ device_type }}
 context:
-  extra_nfsroot_args: " init=/init rootwait"
+  extra_nfsroot_args: " init=/init rootwait minio_results={{ job_artifacts_base }}"
 timeouts:
   job:
     minutes: 30
@@ -133,10 +133,11 @@ actions:
                   export RESULT=pass;
              fi"
 
-          - "if [ -d results ]; then
+          - "MINIO=$(cat /proc/cmdline | tr ' ' '\n' | grep minio_results | cut -d '=' -f 2 || true)
+            if [ -n $MINIO ]; then
                 tar -czf results.tar.gz results/;
                 ci-fairy minio login $CI_JOB_JWT;
-                ci-fairy minio cp results.tar.gz minio://${JOB_ARTIFACTS_BASE}/results.tar.gz;
+                ci-fairy minio cp results.tar.gz minio://$MINIO/results.tar.gz;
              fi"
 
           - "echo hwci: mesa: $RESULT"

diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py
index 00b4114..c74e161 100755 (executable)
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -55,6 +55,7 @@ def generate_lava_yaml(args):
     values['base_system_url_prefix'] = args.base_system_url_prefix
     values['mesa_build_url'] = args.mesa_build_url
     values['job_rootfs_overlay_url'] = args.job_rootfs_overlay_url
+    values['job_artifacts_base'] = args.job_artifacts_base
     values['device_type'] = args.device_type
     values['dtb'] = args.dtb
     values['kernel_image_name'] = args.kernel_image_name
@@ -204,6 +205,7 @@ if __name__ == '__main__':
     parser.add_argument("--base-system-url-prefix")
     parser.add_argument("--mesa-build-url")
     parser.add_argument("--job-rootfs-overlay-url")
+    parser.add_argument("--job-artifacts-base")
     parser.add_argument("--device-type")
     parser.add_argument("--dtb", nargs='?', default="")
     parser.add_argument("--kernel-image-name")