Pass CI and other environment variables to build stage in CSCS CI

pika-org · Jan 11, 2024 · ee54066 · ee54066
1 parent 3ccc5dc
commit ee54066
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 39 deletions.
diff --git a/.gitlab/docker/Dockerfile.spack_build b/.gitlab/docker/Dockerfile.spack_build
@@ -19,6 +19,20 @@ RUN spack build-env $spack_spec -- bash -c "cmake -B${BUILD_DIR} ${SOURCE_DIR} \
     $CMAKE_COMMON_FLAGS $CMAKE_FLAGS && cmake --build ${BUILD_DIR} --target all tests examples"
 
 # Run compile only tests and tests.unit.build, submit ctest metrics to elastic
+ARG ARCH
+ARG BUILD_TYPE
+ARG CI_COMMIT_AUTHOR
+ARG CI_COMMIT_BRANCH
+ARG CI_COMMIT_DESCRIPTION
+ARG CI_COMMIT_MESSAGE
+ARG CI_COMMIT_SHA
+ARG CI_COMMIT_SHORT_SHA
+ARG CI_COMMIT_TIMESTAMP
+ARG CI_COMMIT_TITLE
+ARG COMPILER
+ARG CSCS_LOGSTASH_URL
+ARG SPACK_COMMIT
+ARG SPACK_SPEC
 RUN CTEST_XML=$PWD/ctest.xml; \
     trap "${SOURCE_DIR}/.gitlab/scripts/collect_ctest_metrics.sh ${CTEST_XML}" EXIT; \
     spack build-env $spack_spec -- \

diff --git a/.gitlab/includes/clang11_pipeline.yml b/.gitlab/includes/clang11_pipeline.yml
@@ -45,6 +45,7 @@ clang11_debug_build:
   extends:
     - .container-builder
     - .variables_clang11_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - clang11_spack_image
@@ -56,9 +57,6 @@ clang11_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/clang12_pipeline.yml b/.gitlab/includes/clang12_pipeline.yml
@@ -49,6 +49,7 @@ clang12_debug_build:
   extends:
     - .container-builder
     - .variables_clang12_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - clang12_spack_image
@@ -60,9 +61,6 @@ clang12_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/clang13_pipeline.yml b/.gitlab/includes/clang13_pipeline.yml
@@ -46,6 +46,7 @@ clang13_debug_build:
   extends:
     - .container-builder
     - .variables_clang13_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - clang13_spack_image
@@ -57,9 +58,6 @@ clang13_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/clang14_cuda11_pipeline.yml b/.gitlab/includes/clang14_cuda11_pipeline.yml
@@ -48,6 +48,7 @@ clang14_cuda11_debug_build:
   extends:
     - .container-builder
     - .variables_clang14_cuda11_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - clang14_cuda11_spack_image
@@ -59,9 +60,6 @@ clang14_cuda11_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/clang15_pipeline.yml b/.gitlab/includes/clang15_pipeline.yml
@@ -44,6 +44,7 @@ clang15_debug_build:
   extends:
     - .container-builder
     - .variables_clang15_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - clang15_spack_image
@@ -55,9 +56,6 @@ clang15_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/clang16_pipeline.yml b/.gitlab/includes/clang16_pipeline.yml
@@ -44,6 +44,7 @@ clang16_debug_build:
   extends:
     - .container-builder
     - .variables_clang16_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - clang16_spack_image
@@ -55,9 +56,6 @@ clang16_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/common_pipeline.yml b/.gitlab/includes/common_pipeline.yml
@@ -24,6 +24,10 @@ variables:
                          -DPIKA_WITH_CHECK_MODULE_DEPENDENCIES=ON \
                          -DPIKA_WITH_EXAMPLES=ON -DPIKA_WITH_TESTS=ON \
                          -DPIKA_WITH_PARALLEL_TESTS_BIND_NONE=ON"
+.build_variables_common:
+  variables:
+    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
+    DOCKER_BUILD_ARGS: '["ARCH","BASE_IMAGE","BUILD_TYPE","CI_COMMIT_AUTHOR","CI_COMMIT_BRANCH","CI_COMMIT_DESCRIPTION","CI_COMMIT_MESSAGE","CI_COMMIT_SHA","CI_COMMIT_SHORT_SHA","CI_COMMIT_TIMESTAMP","CI_COMMIT_TITLE","COMPILER","CSCS_LOGSTASH_URL","SPACK_COMMIT","SPACK_SPEC","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
 
 .test_common:
   variables:

diff --git a/.gitlab/includes/gcc11_pipeline.yml b/.gitlab/includes/gcc11_pipeline.yml
@@ -45,6 +45,7 @@ gcc11_debug_build:
   extends:
     - .container-builder
     - .variables_gcc11_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc11_spack_image
@@ -56,9 +57,6 @@ gcc11_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/gcc12_cuda12_pipeline.yml b/.gitlab/includes/gcc12_cuda12_pipeline.yml
@@ -48,6 +48,7 @@ gcc12_cuda12_debug_build:
   extends:
     - .container-builder
     - .variables_gcc12_cuda12_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc12_cuda12_spack_image
@@ -59,9 +60,6 @@ gcc12_cuda12_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/gcc12_pipeline.yml b/.gitlab/includes/gcc12_pipeline.yml
@@ -44,6 +44,7 @@ gcc12_debug_build:
   extends:
     - .container-builder
     - .variables_gcc12_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc12_spack_image
@@ -55,9 +56,6 @@ gcc12_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/gcc13_pipeline.yml b/.gitlab/includes/gcc13_pipeline.yml
@@ -46,6 +46,7 @@ gcc13_debug_build:
   extends:
     - .container-builder
     - .variables_gcc13_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc13_spack_image
@@ -57,9 +58,6 @@ gcc13_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/gcc9_cuda11_pipeline.yml b/.gitlab/includes/gcc9_cuda11_pipeline.yml
@@ -45,6 +45,7 @@ gcc9_cuda11_debug_build:
   extends:
     - .container-builder
     - .variables_gcc9_cuda11_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc9_cuda11_spack_image
@@ -56,9 +57,6 @@ gcc9_cuda11_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/gcc9_pipeline.yml b/.gitlab/includes/gcc9_pipeline.yml
@@ -45,6 +45,7 @@ gcc9_debug_build:
   extends:
     - .container-builder
     - .variables_gcc9_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc9_spack_image
@@ -56,9 +57,6 @@ gcc9_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env

diff --git a/.gitlab/includes/hip_pipeline.yml b/.gitlab/includes/hip_pipeline.yml
@@ -48,6 +48,7 @@ gcc12_hip5_debug_build:
   extends:
     - .container-builder
     - .variables_gcc12_hip5_config
+    - .build_variables_common
     - .cmake_variables_common
   needs:
     - gcc12_hip5_spack_image
@@ -59,9 +60,6 @@ gcc12_hip5_debug_build:
     - CONFIG_TAG=`echo $configuration | sha256sum - | head -c 16`
     - export PERSIST_IMAGE_NAME=$CSCS_REGISTRY_PATH/pika-$compiler-$build_type-build:$CONFIG_TAG
     - echo -e "PERSIST_IMAGE_NAME=$PERSIST_IMAGE_NAME" >> build.env
-  variables:
-    DOCKERFILE: .gitlab/docker/Dockerfile.spack_build
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","SOURCE_DIR","BUILD_DIR","CMAKE_COMMON_FLAGS","CMAKE_FLAGS"]'
   artifacts:
     reports:
       dotenv: build.env