diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-06-12 13:25:45 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2021-06-15 14:02:44 +0200 |
| commit | b035ea8e7d75265e8ebeffe76755c520a9e137d2 (patch) | |
| tree | 9d62eb67d79451b519273d7e528ae304e464ef19 /.gitlab-ci | |
| parent | 1efa5c0ea6005b42ae7e6ffb401ffc9ebec2767c (diff) | |
ci/lava: Always upload Piglit replay images to MinIO
This should probably be set in the trace-job environments, but the
inheritance is a bit of a mess between all the systems at the moment,
and this matches previous hardcoded behaviour at least.
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>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/lava/lava-submit.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index d7de193e223..1cd14bec0b1 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -3,10 +3,6 @@ set -e set -x -rm -rf results -mkdir -p results/job-rootfs-overlay/ -artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/environment.sh - # Try to use the kernel and rootfs built in mainline first, so we're more # likely to hit cache if wget -q --method=HEAD "https://${BASE_SYSTEM_MAINLINE_HOST_PATH}/done"; then @@ -15,6 +11,14 @@ else BASE_SYSTEM_HOST_PATH="${BASE_SYSTEM_FORK_HOST_PATH}" fi +rm -rf results +mkdir -p results/job-rootfs-overlay/ + +# LAVA always uploads to MinIO when necessary as we don't have direct upload +# from the DUT +export PIGLIT_REPLAY_UPLOAD_TO_MINIO=1 +artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/environment.sh + tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ . ci-fairy minio login "${CI_JOB_JWT}" ci-fairy minio cp job-rootfs-overlay.tar.gz "minio://${JOB_ROOTFS_OVERLAY_PATH}" |