summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2021-09-28 12:20:30 -0600
committerTodd Gamblin <tgamblin@llnl.gov>2021-10-01 10:12:37 -0700
commit4637c51c7f41524c63add131298bf0e463c64058 (patch)
tree9235c049c78dd7544b08699ee3b14a584ebc8cf5
parentd233c207254a9679d2c7baf351f531dcf71dab7b (diff)
downloadspack-4637c51c7f41524c63add131298bf0e463c64058.tar.gz
spack-4637c51c7f41524c63add131298bf0e463c64058.tar.bz2
spack-4637c51c7f41524c63add131298bf0e463c64058.tar.xz
spack-4637c51c7f41524c63add131298bf0e463c64058.zip
Service jobs do not need an active environment
-rw-r--r--lib/spack/spack/ci.py5
-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.yaml2
-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.yaml2
6 files changed, 0 insertions, 15 deletions
diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py
index b1dbfcaf0e..d269e87a59 100644
--- a/lib/spack/spack/ci.py
+++ b/lib/spack/spack/ci.py
@@ -1047,11 +1047,6 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file,
]
final_job['when'] = 'always'
- if artifacts_root:
- final_job['variables'] = {
- 'SPACK_CONCRETE_ENV_DIR': concrete_env_dir
- }
-
output_object['rebuild-index'] = final_job
output_object['stages'] = stage_names
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 560ee0a3ae..15f6d989d8 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml
@@ -49,8 +49,6 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - 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 ac420e4c95..035d8d92ba 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
@@ -52,8 +52,6 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - cd ${SPACK_CONCRETE_ENV_DIR}
- - spack env activate --without-view .
tags: ["spack", "public", "medium", "x86_64"]
cdash:
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 0537ca0c4a..958cb628bf 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,8 +357,6 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - 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 7d342a09a0..4ab2c0a923 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
@@ -373,8 +373,6 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - 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 d159e2a9aa..fbaa97a2a8 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml
@@ -79,8 +79,6 @@ spack:
before_script:
- . "./share/spack/setup-env.sh"
- spack --version
- - 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"]