From 4637c51c7f41524c63add131298bf0e463c64058 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 28 Sep 2021 12:20:30 -0600
Subject: Service jobs do not need an active environment

---
 lib/spack/spack/ci.py                                              | 5 -----
 share/spack/gitlab/cloud_pipelines/stacks/build_systems/spack.yaml | 2 --
 share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml  | 2 --
 share/spack/gitlab/cloud_pipelines/stacks/e4s-on-power/spack.yaml  | 2 --
 share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml           | 2 --
 share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml       | 2 --
 6 files changed, 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"]
 
-- 
cgit v1.2.3-70-g09d2