From 2c17c4e63239776750844195233a4b4b69aa89b0 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 11 May 2023 00:34:29 +0200 Subject: ci: remove --mirror-url flag (#37457) The flags --mirror-name / --mirror-url / --directory were deprecated in favor of just passing a positional name, url or directory, and letting spack figure it out. --------- Co-authored-by: Scott Wittenburg --- lib/spack/spack/ci.py | 8 ++------ lib/spack/spack/test/cmd/ci.py | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index 41df54a5d1..f3d6398416 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -634,17 +634,13 @@ class SpackCI: # Reindex script { "reindex-job": { - "script:": [ - "spack buildcache update-index --keys --mirror-url {index_target_mirror}" - ] + "script:": ["spack buildcache update-index --keys {index_target_mirror}"] } }, # Cleanup script { "cleanup-job": { - "script:": [ - "spack -d mirror destroy --mirror-url {mirror_prefix}/$CI_PIPELINE_ID" - ] + "script:": ["spack -d mirror destroy {mirror_prefix}/$CI_PIPELINE_ID"] } }, # Add signing job tags diff --git a/lib/spack/spack/test/cmd/ci.py b/lib/spack/spack/test/cmd/ci.py index b0588bd1dd..cceb093289 100644 --- a/lib/spack/spack/test/cmd/ci.py +++ b/lib/spack/spack/test/cmd/ci.py @@ -234,7 +234,7 @@ spack: assert "rebuild-index" in yaml_contents rebuild_job = yaml_contents["rebuild-index"] - expected = "spack buildcache update-index --keys --mirror-url {0}".format(mirror_url) + expected = "spack buildcache update-index --keys {0}".format(mirror_url) assert rebuild_job["script"][0] == expected assert rebuild_job["custom_attribute"] == "custom!" @@ -2392,7 +2392,7 @@ def test_gitlab_ci_deprecated( assert "rebuild-index" in yaml_contents rebuild_job = yaml_contents["rebuild-index"] - expected = "spack buildcache update-index --keys --mirror-url {0}".format(mirror_url) + expected = "spack buildcache update-index --keys {0}".format(mirror_url) assert rebuild_job["script"][0] == expected assert "variables" in yaml_contents -- cgit v1.2.3-60-g2f50