summaryrefslogtreecommitdiff
path: root/.gitlab-ci/lava
diff options
context:
space:
mode:
authorGuilherme Gallo <guilherme.gallo@collabora.com>2022-07-19 00:22:15 -0300
committerGuilherme Gallo <guilherme.gallo@collabora.com>2022-08-02 01:56:44 +0000
commita19dd43082869f213b25fdcc5c2ec617532e7b64 (patch)
treefd4e3092ecd55c254e32bf893fcab6cba3dd90d8 /.gitlab-ci/lava
parent59f2a072ca2c7601d7b8b26c95ad5427f14073f6 (diff)
downloadmesa-a19dd43082869f213b25fdcc5c2ec617532e7b64.tar.gz
ci/lava: Remove MINIO_RESULTS_UPLOAD if requested
When we don't want to communicate with minio, e.g. running lava_job_submitter script locally, MINIO_RESULTS_UPLOAD should be unset. But this variable is already set by generate-env script, so we need to remove it from the /set-job-env-vars.sh to avoid declaring it in unexpected scenarios. Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17645>
Diffstat (limited to '.gitlab-ci/lava')
-rwxr-xr-x.gitlab-ci/lava/lava_job_submitter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py
index dbc6414bf60..fe2d69a2998 100755
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -160,7 +160,7 @@ def generate_lava_yaml(args):
else:
run_steps += [
"echo Could not find jwt file, disabling MINIO requests...",
- "unset MINIO_RESULTS_UPLOAD",
+ "sed -i '/MINIO_RESULTS_UPLOAD/d' /set-job-env-vars.sh",
]
run_steps += [