Separate compiler and deps installation

.gitlab/docker/Dockerfile.spack_compiler

@@ -24,10 +24,3 @@ RUN spack compiler info $COMPILER > /dev/null 2> /dev/null; compiler_missing=$?;
     fi
 
 RUN echo "spack arch: $(spack arch)"
-
-# Install dependencies for this configuration
-ARG SPACK_SPEC
-ENV spack_spec $SPACK_SPEC
-RUN spack spec -lI $spack_spec && \
-    spack install --fail-fast --only dependencies $spack_spec && \
-    spack clean --all

.gitlab/docker/Dockerfile.spack_dependencies

@@ -0,0 +1,9 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+
+ARG SPACK_SPEC
+ENV spack_spec $SPACK_SPEC
+# Install dependencies for this configuration
+RUN spack spec -lI $spack_spec && \
+    spack install --fail-fast --only dependencies $spack_spec && \
+    spack clean --all

.gitlab/includes/clang11_pipeline.yml

@@ -20,26 +20,45 @@ include:
                   -DPIKA_WITH_MAX_CPU_COUNT=256 -DPIKA_WITH_MALLOC=system \
                   -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
 
-clang11_spack_image:
-  stage: spack_configs
+clang11_spack_compiler_image:
+  stage: spack_compiler
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_clang11_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+clang11_spack_image:
+  stage: spack_dependencies
+  needs: [clang11_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_clang11_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
 clang11_debug_build:
   stage: build
   extends:

.gitlab/includes/clang12_pipeline.yml

@@ -24,26 +24,46 @@ include:
                   -DPIKA_WITH_THREAD_CUMULATIVE_COUNTS=ON -DPIKA_WITH_THREAD_QUEUE_WAITTIME=ON \
                   -DPIKA_WITH_THREAD_STEALING_COUNTS=ON"
 
-clang12_spack_image:
-  stage: spack_configs
+clang12_spack_compiler_image:
+  stage: spack_compiler
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_clang12_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+clang12_spack_image:
+  stage: spack_dependencies
+  needs: [clang12_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_clang12_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
+
 clang12_debug_build:
   stage: build
   extends:

.gitlab/includes/clang13_pipeline.yml

@@ -21,26 +21,45 @@ include:
                   -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DPIKA_WITH_MALLOC=system \
                   -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DPIKA_WITH_STDEXEC=ON"
 
-clang13_spack_image:
-  stage: spack_configs
+clang13_spack_compiler_image:
+  stage: spack_compiler
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_clang13_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+clang13_spack_image:
+  stage: spack_dependencies
+  needs: [clang13_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_clang13_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
 clang13_debug_build:
   stage: build
   extends:

.gitlab/includes/clang14_cuda11_pipeline.yml

@@ -22,27 +22,46 @@ include:
                   -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON -DCMAKE_CUDA_COMPILER=c++ \
                   -DCMAKE_CUDA_ARCHITECTURES=80 -DPIKA_WITH_CXX_LAMBDA_CAPTURE_DECLTYPE=OFF"
 
-clang14_cuda11_spack_image:
-  stage: spack_configs
+clang14_cuda11_spack_compiler_image:
+  stage: spack_compiler
   timeout: 2 hours
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_clang14_cuda11_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+clang14_cuda11_spack_image:
+  stage: spack_dependencies
+  needs: [clang14_cuda11_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_clang14_cuda11_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
 clang14_cuda11_debug_build:
   stage: build
   extends:

.gitlab/includes/clang15_pipeline.yml

@@ -20,26 +20,45 @@ include:
                   -DPIKA_WITH_MALLOC=system -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \
                   -DPIKA_WITH_UNITY_BUILD=OFF"
 
-clang15_spack_image:
-  stage: spack_configs
+clang15_spack_compiler_image:
+  stage: spack_compiler
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_clang15_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+clang15_spack_image:
+  stage: spack_dependencies
+  needs: [clang15_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_clang15_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
 clang15_debug_build:
   stage: build
   extends:

.gitlab/includes/clang16_pipeline.yml

@@ -19,26 +19,45 @@ include:
     CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPIKA_WITH_CXX_STANDARD=$CXXSTD \
                   -DPIKA_WITH_MALLOC=system -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
 
-clang16_spack_image:
-  stage: spack_configs
+clang16_spack_compiler_image:
+  stage: spack_compiler
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_clang16_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+clang16_spack_image:
+  stage: spack_dependencies
+  needs: [clang16_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_clang16_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
 clang16_debug_build:
   stage: build
   extends:

.gitlab/includes/common_pipeline.yml

@@ -9,7 +9,8 @@ include:
 
 stages:
   - spack_base
-  - spack_configs
+  - spack_compiler
+  - spack_dependencies
   - build
   - test
 

.gitlab/includes/gcc10_apex_pipeline.yml

@@ -20,26 +20,45 @@ include:
                   -DPIKA_WITH_APEX=ON -DPIKA_WITH_MALLOC=system \
                   -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
 
-gcc10_apex_spack_image:
-  stage: spack_configs
+gcc10_apex_spack_compiler_image:
+  stage: spack_compiler
   needs: [base_spack_image]
   extends:
     - .container-builder
     - .variables_gcc10_apex_config
   before_script:
     - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
-    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER-$SPACK_SPEC | sha256sum - | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$ARCH-$BASE_IMAGE-$COMPILER | sha256sum - | head -c 16`
     - compiler=${COMPILER/@/-}
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler:$CONFIG_TAG
     - echo -e "compiler=$compiler" >> compiler.env
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER"]'
   artifacts:
     reports:
       dotenv: compiler.env
 
+gcc10_apex_spack_image:
+  stage: spack_dependencies
+  needs: [gcc10_apex_spack_compiler_image]
+  extends:
+    - .container-builder
+    - .variables_gcc10_apex_config
+  before_script:
+    - export DOCKERFILE_SHA=`sha256sum $DOCKERFILE | head -c 16`
+    - CONFIG_TAG=`echo $DOCKERFILE_SHA-$BASE_IMAGE-$SPACK_SPEC | sha256sum - | head -c 16`
+    - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/base/pika-$compiler-dependencies:$CONFIG_TAG
+    - echo -e "compiler=$compiler" >> dependencies.env
+    - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> dependencies.env
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_dependencies
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SPACK_SPEC"]'
+  artifacts:
+    reports:
+      dotenv: dependencies.env
+
 gcc10_apex_release_build:
   stage: build
   extends: