From d84083da61facb6db658d7f858d0ed2e6227cf75 Mon Sep 17 00:00:00 2001
From: boeschf <48126478+boeschf@users.noreply.github.com>
Date: Mon, 26 Feb 2024 11:01:46 +0100
Subject: [PATCH] update deprecated build instructions for cscs-ci (#2256)

---
 ci/cscs/daint_gpu/pipeline.yml | 5 +++--
 ci/cscs/daint_mc/pipeline.yml  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/cscs/daint_gpu/pipeline.yml b/ci/cscs/daint_gpu/pipeline.yml
index aeb2033a29..cc5c94f6d0 100644
--- 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
index 9ac453ae79..bdc3ff4636 100644
--- 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