diff options
| author | Scott Wittenburg <scott.wittenburg@kitware.com> | 2022-05-04 09:18:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 09:18:47 -0600 |
| commit | 6b6147d5a064fdc149d8e1335b5ed62bdb63af25 (patch) | |
| tree | ab5bb449b0bac2a68e1d8daac9b34495ecdc9e96 /share/spack/gitlab | |
| parent | 6702e87ee4cb092fb5211000b6963955dc3a2339 (diff) | |
| download | spack-6b6147d5a064fdc149d8e1335b5ed62bdb63af25.tar.gz spack-6b6147d5a064fdc149d8e1335b5ed62bdb63af25.tar.bz2 spack-6b6147d5a064fdc149d8e1335b5ed62bdb63af25.tar.xz spack-6b6147d5a064fdc149d8e1335b5ed62bdb63af25.zip | |
gitlab: Remove temporary storage url from all stacks (#29949)
Gitlab pipelines run for spack already have other S3 storage locations
configured for storage of binaries, so this PR removes the redundant
per-pipeline mirror. As a result, the "cleanup" jobs will no longer be
generated at the end of each pipeline, removing one possible point of
pipeline failure.
Diffstat (limited to 'share/spack/gitlab')
7 files changed, 2 insertions, 10 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml index 767007132f..9616a503fb 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml @@ -96,7 +96,6 @@ spack: CI_JOB_SIZE: "default" - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: before_script: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml index a8dd1b67a3..9834d28b0d 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml @@ -134,15 +134,12 @@ spack: KUBERNETES_CPU_REQUEST: "500m" KUBERNETES_MEMORY_REQUEST: "500M" - - match: ['@:'] runner-attributes: tags: ["spack", "public", "x86_64"] variables: CI_JOB_SIZE: "default" - - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: image: { "name": "ghcr.io/spack/e4s-ubuntu-18.04:v2021-10-18", "entrypoint": [""] } diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml index 79887506c7..91bfde89f7 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml @@ -47,7 +47,6 @@ spack: runner-attributes: tags: - omicron - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: before_script: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml index a860931458..b283b837cb 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml @@ -241,7 +241,6 @@ spack: runner-attributes: image: { "name": "ghcr.io/spack/e4s-ubuntu-20.04:v2021-10-18", "entrypoint": [""] } tags: ["spack", "public", "large", "ppc64le"] - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: before_script: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 0fd946a0ab..5d635d40d9 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -403,7 +403,6 @@ spack: variables: CI_JOB_SIZE: "default" - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: before_script: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml index d98999fa63..f6f46c20a6 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml @@ -158,7 +158,7 @@ spack: tags: ["spack", "public", "x86_64"] variables: CI_JOB_SIZE: "default" - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" + service-job-attributes: before_script: - . "./share/spack/setup-env.sh" diff --git a/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml index 40875cf31f..fbf641e973 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml @@ -134,7 +134,7 @@ spack: tags: ["spack", "public", "x86_64"] variables: CI_JOB_SIZE: default - temporary-storage-url-prefix: "s3://spack-binaries-prs/pipeline-storage" + broken-specs-url: "s3://spack-binaries-develop/broken-specs" service-job-attributes: image: { "name": "ghcr.io/spack/tutorial-ubuntu-18.04:v2021-11-02", "entrypoint": [""] } @@ -143,7 +143,6 @@ spack: - spack --version tags: ["spack", "public", "x86_64"] - cdash: build-group: Spack Tutorial url: https://cdash.spack.io |