From 8c5045cc8c158d3941d3b4645bdbdd8904964b47 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Tue, 26 Sep 2023 02:12:09 +0200
Subject: [PATCH] update to Spack v0.20.0

---
 .gitlab-ci.yml | 15 ++++++++-------
 README.md      |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9047d8e..ea2c85fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,12 +54,13 @@ deploy-int-release-dev-cscs:
     OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_DEV_TOKEN
     OC_PROJECT: jupyterhub-int
     LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/int
-    INSTALLATION_ROOT: /srv/test-build-2305
+    INSTALLATION_ROOT: /srv/test-build-2309
     SPACK_ENV: test
     RELEASE_NAME: EBRAINS-test
   resource_group: shared-NFS-mount-dev-cscs
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/
+    - if: $CI_PROJECT_NAMESPACE =~ /technical-coordination/
+    # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/
 
 # Deploy the production release of tools (manual pipeline)
 # deploy on the production environment of the okd prod cluster at CSCS
@@ -71,7 +72,7 @@ deploy-prod-release-prod-cscs:
     OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_PROD_TOKEN
     OC_PROJECT: jupyterhub
     LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/prod
-    INSTALLATION_ROOT: /srv/main-spack-instance-2305
+    INSTALLATION_ROOT: /srv/main-spack-instance-2309
     SPACK_ENV: ebrains-23-06
     RELEASE_NAME: EBRAINS-23.06
   resource_group: shared-NFS-mount-prod-cscs
@@ -89,7 +90,7 @@ deploy-prod-release-prod-jsc:
     OPENSHIFT_TOKEN: $JSC_OPENSHIFT_PROD_TOKEN
     OC_PROJECT: jupyterhub
     LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/prod
-    INSTALLATION_ROOT: /srv/main-spack-instance-2305
+    INSTALLATION_ROOT: /srv/main-spack-instance-2309
     SPACK_ENV: ebrains-23-06
     RELEASE_NAME: EBRAINS-23.06
   resource_group: shared-NFS-mount-prod-jsc
@@ -109,7 +110,7 @@ deploy-exp-release-dev-cscs:
     OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_DEV_TOKEN
     OC_PROJECT: jupyterhub-int
     LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/int
-    INSTALLATION_ROOT: /srv/test-build-2305
+    INSTALLATION_ROOT: /srv/test-build-2309
     SPACK_ENV: experimental
     RELEASE_NAME: EBRAINS-experimental
   resource_group: shared-NFS-mount-dev-cscs
@@ -131,7 +132,7 @@ deploy-exp-release-prod-cscs:
     OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_PROD_TOKEN
     OC_PROJECT: jupyterhub
     LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/prod
-    INSTALLATION_ROOT: /srv/main-spack-instance-2305
+    INSTALLATION_ROOT: /srv/main-spack-instance-2309
     SPACK_ENV: experimental
     RELEASE_NAME: EBRAINS-experimental
   resource_group: shared-NFS-mount-prod-cscs
@@ -156,7 +157,7 @@ deploy-exp-release-prod-jsc:
     OPENSHIFT_TOKEN: $JSC_OPENSHIFT_PROD_TOKEN
     OC_PROJECT: jupyterhub
     LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/prod
-    INSTALLATION_ROOT: /srv/main-spack-instance-2305
+    INSTALLATION_ROOT: /srv/main-spack-instance-2309
     SPACK_ENV: experimental
     RELEASE_NAME: EBRAINS-experimental
   resource_group: shared-NFS-mount-prod-jsc
diff --git a/README.md b/README.md
index 99081c6d..6d29458e 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,9 @@ Clone this repository. You can use the `ebrains-yy-mm` branches to install the E
 git clone --branch {branch-name} https://gitlab.ebrains.eu/technical-coordination/project-internal/devops/platform/ebrains-spack-builds.git
 ```
 
-Clone Spack. We currently use version v0.19.2:
+Clone Spack. We currently use version v0.20.0:
 ```
-git clone --depth 1 -c advice.detachedHead=false -c feature.manyFiles=true --branch v0.19.2 https://github.com/spack/spack
+git clone --depth 1 -c advice.detachedHead=false -c feature.manyFiles=true --branch v0.20.0 https://github.com/spack/spack
 ```
 
 Activate Spack:
-- 
GitLab