diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2023-05-11 00:34:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 16:34:29 -0600 |
| commit | 2c17c4e63239776750844195233a4b4b69aa89b0 (patch) | |
| tree | a4d46a899d4fe087f9db5ce04ebfd04790282f7c | |
| parent | ec800cccbb85bca59b405622017cb9b0b74c7cfe (diff) | |
| download | spack-2c17c4e63239776750844195233a4b4b69aa89b0.tar.gz spack-2c17c4e63239776750844195233a4b4b69aa89b0.tar.bz2 spack-2c17c4e63239776750844195233a4b4b69aa89b0.tar.xz spack-2c17c4e63239776750844195233a4b4b69aa89b0.zip | |
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 <scott.wittenburg@kitware.com>
| -rw-r--r-- | lib/spack/spack/ci.py | 8 | ||||
| -rw-r--r-- | lib/spack/spack/test/cmd/ci.py | 4 | ||||
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 2 |
3 files changed, 5 insertions, 9 deletions
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 diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 31c0dcc08b..bdd664b8d1 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -182,7 +182,7 @@ protected-publish: - spack --version - export COPY_SPECS_DIR=${CI_PROJECT_DIR}/jobs_scratch_dir/specs_to_copy - spack buildcache sync --manifest-glob "${COPY_SPECS_DIR}/*.json" - - spack buildcache update-index --mirror-url ${SPACK_COPY_BUILDCACHE} + - spack buildcache update-index "${SPACK_COPY_BUILDCACHE}" ######################################## # TEMPLATE FOR ADDING ANOTHER PIPELINE |