Skip to content
Snippets Groups Projects
Commit 4d18241b authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

feat: use same build-env image for Lab and GitLab builds 

(but continue using the old image for OKD CSCS build jobs)
parent 50236d62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 5 deletions
.gitlab-ci.yml
+ 8
− 5
View file @ 4d18241b
...@@ -3,8 +3,7 @@ stages: ...@@ -3,8 +3,7 @@ stages:
- test - test
variables: variables:
BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:okd_23.06 BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/base:devel
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.21.1 SPACK_VERSION: v0.21.1
SPACK_PATH_GITLAB: /mnt/spack_v0.21.1 SPACK_PATH_GITLAB: /mnt/spack_v0.21.1
SYSTEMNAME: ebrainslab SYSTEMNAME: ebrainslab
...@@ -51,6 +50,7 @@ variables: ...@@ -51,6 +50,7 @@ variables:
deploy-int-release-dev-cscs: deploy-int-release-dev-cscs:
extends: .deploy-build-environment extends: .deploy-build-environment
variables: variables:
BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:okd_23.06
OPENSHIFT_SERVER: $CSCS_OPENSHIFT_DEV_SERVER OPENSHIFT_SERVER: $CSCS_OPENSHIFT_DEV_SERVER
OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_DEV_TOKEN OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_DEV_TOKEN
OC_PROJECT: jupyterhub-int OC_PROJECT: jupyterhub-int
...@@ -68,6 +68,7 @@ deploy-int-release-dev-cscs: ...@@ -68,6 +68,7 @@ deploy-int-release-dev-cscs:
deploy-prod-release-prod-cscs: deploy-prod-release-prod-cscs:
extends: .deploy-build-environment extends: .deploy-build-environment
variables: variables:
BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:okd_23.06
OPENSHIFT_SERVER: $CSCS_OPENSHIFT_PROD_SERVER OPENSHIFT_SERVER: $CSCS_OPENSHIFT_PROD_SERVER
OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_PROD_TOKEN OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_PROD_TOKEN
OC_PROJECT: jupyterhub OC_PROJECT: jupyterhub
...@@ -88,6 +89,7 @@ deploy-prod-release-prod-cscs: ...@@ -88,6 +89,7 @@ deploy-prod-release-prod-cscs:
deploy-exp-release-dev-cscs: deploy-exp-release-dev-cscs:
extends: .deploy-build-environment extends: .deploy-build-environment
variables: variables:
BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:okd_23.06
OPENSHIFT_SERVER: $CSCS_OPENSHIFT_DEV_SERVER OPENSHIFT_SERVER: $CSCS_OPENSHIFT_DEV_SERVER
OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_DEV_TOKEN OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_DEV_TOKEN
OC_PROJECT: jupyterhub-int OC_PROJECT: jupyterhub-int
...@@ -107,6 +109,7 @@ deploy-exp-release-dev-cscs: ...@@ -107,6 +109,7 @@ deploy-exp-release-dev-cscs:
deploy-exp-release-prod-cscs: deploy-exp-release-prod-cscs:
extends: .deploy-build-environment extends: .deploy-build-environment
variables: variables:
BUILD_ENV_DOCKER_IMAGE: docker-registry.ebrains.eu/tc/ebrains-spack-build-env/okd:okd_23.06
OPENSHIFT_SERVER: $CSCS_OPENSHIFT_PROD_SERVER OPENSHIFT_SERVER: $CSCS_OPENSHIFT_PROD_SERVER
OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_PROD_TOKEN OPENSHIFT_TOKEN: $CSCS_OPENSHIFT_PROD_TOKEN
OC_PROJECT: jupyterhub OC_PROJECT: jupyterhub
...@@ -126,7 +129,7 @@ build-spack-env-on-runner: ...@@ -126,7 +129,7 @@ build-spack-env-on-runner:
tags: tags:
- docker-runner - docker-runner
- read-only - read-only
image: $GITLAB_BUILD_ENV_DOCKER_IMAGE image: $BUILD_ENV_DOCKER_IMAGE
variables: variables:
SPACK_DEV_ENV: ebrains-dev SPACK_DEV_ENV: ebrains-dev
script: script:
...@@ -161,7 +164,7 @@ sync-gitlab-spack-instance: ...@@ -161,7 +164,7 @@ sync-gitlab-spack-instance:
tags: tags:
- docker-runner - docker-runner
- read-write - read-write
image: $GITLAB_BUILD_ENV_DOCKER_IMAGE image: $BUILD_ENV_DOCKER_IMAGE
variables: variables:
SPACK_REPO_PATH: $SPACK_PATH_GITLAB/ebrains-spack-builds SPACK_REPO_PATH: $SPACK_PATH_GITLAB/ebrains-spack-builds
script: script:
...@@ -196,7 +199,7 @@ test-gitlab-spack-instance: ...@@ -196,7 +199,7 @@ test-gitlab-spack-instance:
tags: tags:
- docker-runner - docker-runner
- read-write - read-write
image: $GITLAB_BUILD_ENV_DOCKER_IMAGE image: $BUILD_ENV_DOCKER_IMAGE
variables: variables:
SPACK_REPO_PATH: $SPACK_PATH_GITLAB/ebrains-spack-builds SPACK_REPO_PATH: $SPACK_PATH_GITLAB/ebrains-spack-builds
SPACK_USER_CACHE_PATH: $SPACK_PATH_GITLAB/spack/.spack SPACK_USER_CACHE_PATH: $SPACK_PATH_GITLAB/spack/.spack
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment