zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: remove --mirror-url flag (#37457)

Browse Source 
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>
This commit is contained in:
Harmen Stoppels 2023-05-11 00:34:29 +02:00 committed by GitHub
parent ec800cccbb
commit 2c17c4e632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/ci.py
View File

@ -634,17 +634,13 @@ def generate_ir(self):
# 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

4
lib/spack/spack/test/cmd/ci.py
View File

@ -234,7 +234,7 @@ def test_ci_generate_with_env(
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

2
share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
View File

@ -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