From e33c09075988768d5bd4b3ef384ca702973eafd6 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 27 Sep 2023 09:16:31 +0200
Subject: [PATCH 1/4] skip non-EBRAINS packages from spack.yaml
---
spack.yaml | 2 --
1 file changed, 2 deletions(-)
diff --git a/spack.yaml b/spack.yaml
index 4f60b56f..ab828d5e 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -3,7 +3,6 @@ spack:
- site-config/$SYSTEMNAME
specs:
# EBRAINS tools
- - apbs@3.4.0
- arbor@0.9.0 +python +mpi
- biobb-analysis@4.0.1
- biobb-chemistry@4.0.0
@@ -38,7 +37,6 @@ spack:
- py-netpyne@1.0.5
- py-neurom@3.2.2
- py-neuror@1.6.4
- - py-pdb2pqr@3.5.2
- py-pynn@0.11.0 +mpi
- py-pyunicore@0.15.0
- py-quantities-scidash@0.12.4.3
--
GitLab
From 704cb5f6eda60c9c5b3a9019e182d3337b02bc31 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 27 Sep 2023 09:22:02 +0200
Subject: [PATCH 2/4] fix build env container image tags
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3abfbcc6..e427343c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,8 @@ stages:
- build
variables:
- BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:devel
- GITLAB_BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/gitlab_runners_nfs:devel
+ BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:okd_23.06
+ GITLAB_BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/gitlab_runners_nfs:gitlab_runners_nfs_23.06
SPACK_VERSION: v0.19.2
SPACK_PATH_GITLAB: /mnt/spack_v0.19.2
SYSTEMNAME: ebrainslab
--
GitLab
From c3f99d2606ed17b46b23fb82a711d2eb5ed5b616 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 27 Sep 2023 17:13:51 +0200
Subject: [PATCH 3/4] fix typo in installation script
---
install_spack_env.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install_spack_env.sh b/install_spack_env.sh
index 758b7b5e..b354b43b 100644
--- a/install_spack_env.sh
+++ b/install_spack_env.sh
@@ -53,7 +53,7 @@ if [ $SYSTEMNAME == ebrainslab ]
then
EBRAINS_SPACK_COMPILER=$(grep 'compiler' $EBRAINS_REPO/site-config/$SYSTEMNAME/packages.yaml | awk -F'[][]' '{ print $2 }')
spack compiler find
- spack load $EBRAINS_SPACK_COMPILER || (spack install $EBRAINS_SPACK_COMPILER; spack load $EBRAINS_SPACK_COMPILER)
+ spack load $EBRAINS_SPACK_COMPILER || { spack install $EBRAINS_SPACK_COMPILER; spack load $EBRAINS_SPACK_COMPILER; }
fi
spack compiler find
--
GitLab
From 0aed9f73aea5bfdb46550880910e0dcd2ae822fb Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 27 Sep 2023 17:14:30 +0200
Subject: [PATCH 4/4] switch to EBRAINS-23.09
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e427343c..776c643f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,8 +72,8 @@ deploy-prod-release-prod-cscs:
OC_PROJECT: jupyterhub
LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/prod
INSTALLATION_ROOT: /srv/main-spack-instance-2305
- SPACK_ENV: ebrains-23-06
- RELEASE_NAME: EBRAINS-23.06
+ SPACK_ENV: ebrains-23-09
+ RELEASE_NAME: EBRAINS-23.09
resource_group: shared-NFS-mount-prod-cscs
rules:
- if: $CI_COMMIT_BRANCH =~ /^ebrains/
@@ -90,8 +90,8 @@ deploy-prod-release-prod-jsc:
OC_PROJECT: jupyterhub
LAB_KERNEL_ROOT: /srv/jupyterlab_kernels/prod
INSTALLATION_ROOT: /srv/main-spack-instance-2305
- SPACK_ENV: ebrains-23-06
- RELEASE_NAME: EBRAINS-23.06
+ SPACK_ENV: ebrains-23-09
+ RELEASE_NAME: EBRAINS-23.09
resource_group: shared-NFS-mount-prod-jsc
rules:
- if: $CI_COMMIT_BRANCH =~ /^ebrains/
--
GitLab