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

Use update-index --mirror-url <url> instead of -d <url> (#34519)

Browse Source
This commit is contained in:
Harmen Stoppels 2022-12-14 10:03:18 +01:00 committed by GitHub
parent 45b40115fb
commit 9032179b34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1264,7 +1264,7 @@ def generate_gitlab_ci_yaml(
final_job["stage"] = "stage-rebuild-index" final_job["stage"] = "stage-rebuild-index"
final_job["script"] = [ 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["when"] = "always"
final_job["retry"] = service_job_retries final_job["retry"] = service_job_retries

2
lib/spack/spack/test/ci.py
View File

@ -322,7 +322,7 @@ def make_rebuild_index_job(use_artifact_buildcache, optimize, use_dependencies):
result = { result = {
"stage": "stage-rebuild-index", "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"], "tags": ["tag-0", "tag-1"],
"image": {"name": "spack/centos7", "entrypoint": [""]}, "image": {"name": "spack/centos7", "entrypoint": [""]},
"after_script": ['rm -rf "./spack"'], "after_script": ['rm -rf "./spack"'],

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

@ -231,7 +231,7 @@ def test_ci_generate_with_env(
assert "rebuild-index" in yaml_contents assert "rebuild-index" in yaml_contents
rebuild_job = yaml_contents["rebuild-index"] 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 rebuild_job["script"][0] == expected
assert "variables" in yaml_contents assert "variables" in yaml_contents