Use correct arch on daint

GridTools · Sep 4, 2024 · 9fdf900 · 9fdf900
1 parent bb9c295
commit 9fdf900
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/ci/cscs.yml b/ci/cscs.yml
@@ -9,6 +9,7 @@ variables:
   CUDA_DRIVER_VERSION: "470.57.02"
   PROJECT_NAME: gridtools_jl
   PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/pasc_kilos/${CONTAINER_RUNNER}/${PROJECT_NAME}_image:$CI_COMMIT_SHORT_SHA
+  CPU_ARCH: "linux-sles15-haswell"
 
 include:
   - remote: 'https://gitlab.com/cscs-ci/recipes/-/raw/master/templates/v2/.ci-ext.yml'
@@ -41,7 +42,7 @@ build_base_stage0_image_job:
   extends: .gt-container-builder
   variables:
     DOCKERFILE: docker/base/Dockerfile
-    DOCKER_BUILD_ARGS: '["INSTALL_CUDA_DRIVER=$GPU_ENABLED", "CUDA_DRIVER_VERSION=$CUDA_DRIVER_VERSION"]'
+    DOCKER_BUILD_ARGS: '["INSTALL_CUDA_DRIVER=$GPU_ENABLED", "CUDA_DRIVER_VERSION=$CUDA_DRIVER_VERSION", "CPU_ARCH=$CPU_ARCH"]'
     PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/gridtools/${CONTAINER_RUNNER}/gridtools_jl_base_image
     WATCH_FILECHANGES: 'docker/base/Dockerfile'
     ENV_VAR_NAME: BASE_IMAGE_STAGE0

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -2,6 +2,7 @@
 FROM ubuntu:23.04 as builder
 ARG INSTALL_CUDA_DRIVER=false
 ARG CUDA_DRIVER_VERSION
+ARG CPU_ARCH
 
 SHELL ["/bin/bash", "-c"]
 
@@ -25,13 +26,7 @@ RUN git clone --depth 1 -c feature.manyFiles=true https://github.com/spack/spack
 WORKDIR ./spack/bin
 
 # avoid issues with proxy in CSCS CI
-RUN ./spack config add config:url_fetch_method:curl
-RUN cat <<EOF > /root/.curlrc
-retry = 10
-retry-all-errors
-retry-connrefused
-retry-max-time = 30
-EOF
+RUN ./spack config add packages:all:target:$CPU_ARCH
 
 RUN ./spack install gcc@11
 

diff --git a/docker/base_spack_deps/Dockerfile b/docker/base_spack_deps/Dockerfile
@@ -17,7 +17,6 @@ RUN ./spack -e ${PROJECT_NAME}_env compiler find $(./spack location --install-di
 # using --fresh ensures the concretization does not care about the build cache (untested and not
 #  used right now as we don't use a build cache yet)
 RUN ./spack -e ${PROJECT_NAME}_env concretize --fresh
-RUN ./spack config rm config:url_fetch_method
 COPY ./docker/base_spack_deps/run_until_succeed.sh ./run_until_succeed.sh
 RUN ./run_until_succeed.sh ./spack -e ${PROJECT_NAME}_env install