diff --git a/ci/cscs/daint_gpu/pipeline.yml b/ci/cscs/daint_gpu/pipeline.yml index aeb2033a29dcc3347284578116845ec82cfc095b..cc5c94f6d083872db2c55dcf0580996679095854 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 9ac453ae79d01321ccbe13f183605ae9d047101b..bdc3ff463688f9f9c98cd488219e255c448c183d 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