diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34ff950aeb0365deab29437a8c39cb5dac5f7f1b..2b4b701bc20a791c24c6f1d75a4c339ea8bb5ef7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ 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-2302 + INSTALLATION_ROOT: /srv/test-build-2305 SPACK_ENV: test RELEASE_NAME: EBRAINS-test resource_group: shared-NFS-mount-dev-cscs @@ -57,9 +57,9 @@ 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-2302 - SPACK_ENV: ebrains-23-02 - RELEASE_NAME: EBRAINS-23.02 + INSTALLATION_ROOT: /srv/main-spack-instance-2305 + SPACK_ENV: ebrains-23-06 + RELEASE_NAME: EBRAINS-23.06 resource_group: shared-NFS-mount-prod-cscs rules: - if: $CI_COMMIT_BRANCH =~ /ebrains/ @@ -75,9 +75,9 @@ 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-2302 - SPACK_ENV: ebrains-23-02 - RELEASE_NAME: EBRAINS-23.02 + INSTALLATION_ROOT: /srv/main-spack-instance-2305 + SPACK_ENV: ebrains-23-06 + RELEASE_NAME: EBRAINS-23.06 resource_group: shared-NFS-mount-prod-jsc rules: - if: $CI_COMMIT_BRANCH =~ /ebrains/ @@ -95,7 +95,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-2302 + INSTALLATION_ROOT: /srv/test-build-2305 SPACK_ENV: experimental RELEASE_NAME: EBRAINS-experimental resource_group: shared-NFS-mount-dev-cscs @@ -117,7 +117,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-2302 + INSTALLATION_ROOT: /srv/main-spack-instance-2305 SPACK_ENV: experimental RELEASE_NAME: EBRAINS-experimental resource_group: shared-NFS-mount-prod-cscs @@ -142,7 +142,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-2302 + INSTALLATION_ROOT: /srv/main-spack-instance-2305 SPACK_ENV: experimental RELEASE_NAME: EBRAINS-experimental resource_group: shared-NFS-mount-prod-jsc @@ -286,5 +286,5 @@ sync-gitlab-spack-instance: - spack_logs when: always rules: - - if: $CI_COMMIT_BRANCH == 'spack-0.19.2' && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE =~ /technical-coordination/ when: manual