summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2021-09-28 12:00:15 -0600
committerTodd Gamblin <tgamblin@llnl.gov>2021-10-01 10:12:37 -0700
commitd233c207254a9679d2c7baf351f531dcf71dab7b (patch)
treecc8bff0e277025c743a68a3488eaa288b89bd56e
parent5f527075bf4e3e4e9a56735f5b6f8725b090943d (diff)
downloadspack-d233c207254a9679d2c7baf351f531dcf71dab7b.tar.gz
spack-d233c207254a9679d2c7baf351f531dcf71dab7b.tar.bz2
spack-d233c207254a9679d2c7baf351f531dcf71dab7b.tar.xz
spack-d233c207254a9679d2c7baf351f531dcf71dab7b.zip
Activate concrete env dir in all service jobs
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml2
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml3
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml2
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml2
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml7
5 files changed, 6 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 5bbf04051d..560ee0a3ae 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
@@ -49,7 +49,7 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - cd share/spack/gitlab/cloud_pipelines/stacks/build_systems
+ - cd ${SPACK_CONCRETE_ENV_DIR}
- spack env activate --without-view .
image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2020-09-01", "entrypoint": [""] }
tags: ["spack", "public", "medium", "x86_64"]
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 6dce04172c..ac420e4c95 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
@@ -46,12 +46,13 @@ spack:
runner-attributes:
tags: ["spack", "public", "large", "x86_64"]
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/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] }
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - cd share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk
+ - cd ${SPACK_CONCRETE_ENV_DIR}
- spack env activate --without-view .
tags: ["spack", "public", "medium", "x86_64"]
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 9bf476ad03..0537ca0c4a 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
@@ -357,7 +357,7 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - cd share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power
+ - cd ${SPACK_CONCRETE_ENV_DIR}
- spack env activate --without-view .
image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu20.04-runner-ppc64le:2021-07-01", "entrypoint": [""] }
tags: ["spack", "public", "medium", "ppc64le"]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
index 0fb454c8a6..7d342a09a0 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
@@ -373,7 +373,7 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - cd share/spack/gitlab/cloud_pipelines/stacks/e4s
+ - cd ${SPACK_CONCRETE_ENV_DIR}
- spack env activate --without-view .
image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] }
tags: ["spack", "public", "medium", "x86_64"]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
index 30182a82d9..d159e2a9aa 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
@@ -79,14 +79,9 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - cd share/spack/gitlab/cloud_pipelines/stacks/radiuss
+ - cd ${SPACK_CONCRETE_ENV_DIR}
- spack env activate --without-view .
image: { "name": "ghcr.io/scottwittenburg/ecpe4s-ubuntu18.04-runner-x86_64:2021-05-15", "entrypoint": [""] }
- #before_script:
- # - . "./share/spack/setup-env.sh"
- # - spack --version
- # - cd share/spack/gitlab/cloud_pipelines/stacks/radiuss
- # - spack env activate --without-view .
tags: ["spack", "public", "medium", "x86_64"]
cdash: