From 3c757aa44f51409143fe4e4334b4257bd6ab5db6 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 11 Jun 2021 15:43:17 +0100 Subject: [PATCH] ci/lava: Rename environment variable script Make it line up with bare-metal. Signed-off-by: Daniel Stone Acked-by: Martin Peres Acked-by: Emma Anholt Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci/lava/lava-submit.sh | 2 +- .gitlab-ci/lava/lava.yml.jinja2 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index 1cd14be..f09fb2d 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -17,7 +17,7 @@ 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 +artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ . ci-fairy minio login "${CI_JOB_JWT}" diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2 index 6997844..9368bb5 100644 --- a/.gitlab-ci/lava/lava.yml.jinja2 +++ b/.gitlab-ci/lava/lava.yml.jinja2 @@ -83,9 +83,8 @@ actions: - for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done - wget -S --progress=dot:giga -O- {{ mesa_build_url }} | tar -xz - - mkdir -p /job-overlay - - wget -S --progress=dot:giga -O- {{ job_rootfs_overlay_url }} | tar -xz -C /job-overlay/ - - . /job-overlay/environment.sh + - wget -S --progress=dot:giga -O- {{ job_rootfs_overlay_url }} | tar -xz -C / + - . /set-job-env-vars.sh - mkdir -p $CI_PROJECT_DIR - ln -sf /install $CI_PROJECT_DIR/install -- 2.7.4