update deprecated build instructions for cscs-ci (#2256)

arbor-sim · Feb 26, 2024 · d84083d · d84083d
1 parent 22c7711
commit d84083d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ci/cscs/daint_gpu/pipeline.yml b/ci/cscs/daint_gpu/pipeline.yml
@@ -10,15 +10,16 @@ variables:
   PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/software/arbor_daint_gpu:$CI_COMMIT_SHORT_SHA
 
 build-base:
-  extends: .container-builder-dynamic-name
+  extends: [.container-builder-cscs-zen2, .dynamic-image-name]
   stage: build_base
   variables:
     DOCKERFILE: ci/cscs/daint_gpu/Dockerfile.base
     PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/base/arbor_daint_gpu_base_image
     WATCH_FILECHANGES: 'ci/cscs/daint_gpu/Dockerfile.base'
+    DOCKER_BUILD_ARGS: '["TARGET_SYSTEM=daint-mc"]'
 
 build-arbor:
-  extends: .container-builder
+  extends: .container-builder-cscs-zen2
   stage: build
   variables:
     DOCKERFILE: ci/cscs/daint_gpu/Dockerfile

diff --git a/ci/cscs/daint_mc/pipeline.yml b/ci/cscs/daint_mc/pipeline.yml
@@ -10,15 +10,16 @@ variables:
   PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/software/arbor_daint_mc:$CI_COMMIT_SHORT_SHA
 
 build-base:
-  extends: .container-builder-dynamic-name
+  extends: [.container-builder-cscs-zen2, .dynamic-image-name]
   stage: build_base
   variables:
     DOCKERFILE: ci/cscs/daint_mc/Dockerfile.base
     PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/base/arbor_daint_mc_base_image
     WATCH_FILECHANGES: 'ci/cscs/daint_mc/Dockerfile.base'
+    DOCKER_BUILD_ARGS: '["TARGET_SYSTEM=daint-mc"]'
 
 build-arbor:
-  extends: .container-builder
+  extends: .container-builder-cscs-zen2
   stage: build
   variables:
     DOCKERFILE: ci/cscs/daint_mc/Dockerfile