From 9032179b347c74d22d682e4e167d1a79c4843cdd Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 14 Dec 2022 10:03:18 +0100 Subject: Use update-index --mirror-url instead of -d (#34519) --- lib/spack/spack/ci.py | 2 +- lib/spack/spack/test/ci.py | 2 +- lib/spack/spack/test/cmd/ci.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index 6dcfb7a7f3..fe3988969e 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -1264,7 +1264,7 @@ def generate_gitlab_ci_yaml( final_job["stage"] = "stage-rebuild-index" final_job["script"] = [ - "spack buildcache update-index --keys -d {0}".format(index_target_mirror) + "spack buildcache update-index --keys --mirror-url {0}".format(index_target_mirror) ] final_job["when"] = "always" final_job["retry"] = service_job_retries diff --git a/lib/spack/spack/test/ci.py b/lib/spack/spack/test/ci.py index a55f5841eb..58b0971389 100644 --- a/lib/spack/spack/test/ci.py +++ b/lib/spack/spack/test/ci.py @@ -322,7 +322,7 @@ def test_ci_workarounds(): result = { "stage": "stage-rebuild-index", - "script": "spack buildcache update-index -d s3://mirror", + "script": "spack buildcache update-index --mirror-url s3://mirror", "tags": ["tag-0", "tag-1"], "image": {"name": "spack/centos7", "entrypoint": [""]}, "after_script": ['rm -rf "./spack"'], diff --git a/lib/spack/spack/test/cmd/ci.py b/lib/spack/spack/test/cmd/ci.py index 176bb9a060..f25020280b 100644 --- a/lib/spack/spack/test/cmd/ci.py +++ b/lib/spack/spack/test/cmd/ci.py @@ -231,7 +231,7 @@ spack: assert "rebuild-index" in yaml_contents rebuild_job = yaml_contents["rebuild-index"] - expected = "spack buildcache update-index --keys -d {0}".format(mirror_url) + expected = "spack buildcache update-index --keys --mirror-url {0}".format(mirror_url) assert rebuild_job["script"][0] == expected assert "variables" in yaml_contents -- cgit v1.2.3-70-g09d2