From 6ee868fe1f0bd63e134e9bac31a506e41876a07e Mon Sep 17 00:00:00 2001 From: aurianer Date: Tue, 23 Jan 2024 18:10:28 +0100 Subject: [PATCH] Change the order of the jobs in the extend clause --- .gitlab/includes/clang11_pipeline.yml | 10 +++++----- .gitlab/includes/clang12_pipeline.yml | 10 +++++----- .gitlab/includes/clang13_pipeline.yml | 10 +++++----- .gitlab/includes/clang14_cuda11_pipeline.yml | 10 +++++----- .gitlab/includes/clang15_pipeline.yml | 10 +++++----- .gitlab/includes/clang16_pipeline.yml | 10 +++++----- .gitlab/includes/clang17_pipeline.yml | 10 +++++----- .gitlab/includes/gcc10_apex_pipeline.yml | 10 +++++----- .gitlab/includes/gcc11_pipeline.yml | 8 ++++---- .gitlab/includes/gcc12_cuda12_pipeline.yml | 10 +++++----- .gitlab/includes/gcc12_hip5_pipeline.yml | 11 +++++------ .gitlab/includes/gcc12_pipeline.yml | 10 +++++----- .gitlab/includes/gcc13_pipeline.yml | 10 +++++----- .gitlab/includes/gcc9_cuda11_pipeline.yml | 10 +++++----- .gitlab/includes/gcc9_pipeline.yml | 10 +++++----- .gitlab/includes/performance_gcc13_pipeline.yml | 6 +++--- 16 files changed, 77 insertions(+), 78 deletions(-) diff --git a/.gitlab/includes/clang11_pipeline.yml b/.gitlab/includes/clang11_pipeline.yml index 7b1fb2dcd9..f64e9e35e7 100644 --- a/.gitlab/includes/clang11_pipeline.yml +++ b/.gitlab/includes/clang11_pipeline.yml @@ -22,24 +22,24 @@ include: clang11_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang11_config + - .compiler_image_template clang11_spack_image: needs: [clang11_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang11_config + - .dependencies_image_template clang11_debug_build: needs: [clang11_spack_image] extends: - - .build_template - .variables_clang11_config + - .build_template clang11_debug_test: needs: [clang11_debug_build] extends: - - .test_template - - .test_common_mc - .variables_clang11_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/clang12_pipeline.yml b/.gitlab/includes/clang12_pipeline.yml index a3aaa39b84..fc8f58da84 100644 --- a/.gitlab/includes/clang12_pipeline.yml +++ b/.gitlab/includes/clang12_pipeline.yml @@ -26,24 +26,24 @@ include: clang12_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang12_config + - .compiler_image_template clang12_spack_image: needs: [clang12_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang12_config + - .dependencies_image_template clang12_debug_build: needs: [clang12_spack_image] extends: - - .build_template - .variables_clang12_config + - .build_template clang12_debug_test: needs: [clang12_debug_build] extends: - - .test_template - - .test_common_mc - .variables_clang12_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/clang13_pipeline.yml b/.gitlab/includes/clang13_pipeline.yml index 59248bd4c8..6e3f172f57 100644 --- a/.gitlab/includes/clang13_pipeline.yml +++ b/.gitlab/includes/clang13_pipeline.yml @@ -23,24 +23,24 @@ include: clang13_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang13_config + - .compiler_image_template clang13_spack_image: needs: [clang13_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang13_config + - .dependencies_image_template clang13_debug_build: needs: [clang13_spack_image] extends: - - .build_template - .variables_clang13_config + - .build_template clang13_debug_test: needs: [clang13_debug_build] extends: - - .test_template - - .test_common_mc - .variables_clang13_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/clang14_cuda11_pipeline.yml b/.gitlab/includes/clang14_cuda11_pipeline.yml index 2eadc5b7ea..8d29859060 100644 --- a/.gitlab/includes/clang14_cuda11_pipeline.yml +++ b/.gitlab/includes/clang14_cuda11_pipeline.yml @@ -24,24 +24,24 @@ include: clang14_cuda11_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang14_cuda11_config + - .compiler_image_template clang14_cuda11_spack_image: needs: [clang14_cuda11_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang14_cuda11_config + - .dependencies_image_template clang14_cuda11_debug_build: needs: [clang14_cuda11_spack_image] extends: - - .build_template - .variables_clang14_cuda11_config + - .build_template clang14_cuda11_debug_test: needs: [clang14_cuda11_debug_build] extends: - - .test_template - - .test_common_gpu_clariden_cuda - .variables_clang14_cuda11_config + - .test_common_gpu_clariden_cuda + - .test_template diff --git a/.gitlab/includes/clang15_pipeline.yml b/.gitlab/includes/clang15_pipeline.yml index 0807414445..091aef9acb 100644 --- a/.gitlab/includes/clang15_pipeline.yml +++ b/.gitlab/includes/clang15_pipeline.yml @@ -22,24 +22,24 @@ include: clang15_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang15_config + - .compiler_image_template clang15_spack_image: needs: [clang15_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang15_config + - .dependencies_image_template clang15_debug_build: needs: [clang15_spack_image] extends: - - .build_template - .variables_clang15_config + - .build_template clang15_debug_test: needs: [clang15_debug_build] extends: - - .test_template - - .test_common_mc - .variables_clang15_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/clang16_pipeline.yml b/.gitlab/includes/clang16_pipeline.yml index d8aa476776..76702ed512 100644 --- a/.gitlab/includes/clang16_pipeline.yml +++ b/.gitlab/includes/clang16_pipeline.yml @@ -21,24 +21,24 @@ include: clang16_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang16_config + - .compiler_image_template clang16_spack_image: needs: [clang16_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang16_config + - .dependencies_image_template clang16_debug_build: needs: [clang16_spack_image] extends: - - .build_template - .variables_clang16_config + - .build_template clang16_debug_test: needs: [clang16_debug_build] extends: - - .test_template - - .test_common_mc - .variables_clang16_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/clang17_pipeline.yml b/.gitlab/includes/clang17_pipeline.yml index dd3e346788..bc36c90136 100644 --- a/.gitlab/includes/clang17_pipeline.yml +++ b/.gitlab/includes/clang17_pipeline.yml @@ -21,24 +21,24 @@ include: clang17_spack_compiler_image: extends: - - .compiler_image_template - .variables_clang17_config + - .compiler_image_template clang17_spack_image: needs: [clang17_spack_compiler_image] extends: - - .dependencies_image_template - .variables_clang17_config + - .dependencies_image_template clang17_debug_build: needs: [clang17_spack_image] extends: - - .build_template - .variables_clang17_config + - .build_template clang17_debug_test: needs: [clang17_debug_build] extends: - - .test_template - - .test_common_mc - .variables_clang17_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/gcc10_apex_pipeline.yml b/.gitlab/includes/gcc10_apex_pipeline.yml index 8570acbcca..a26fb55406 100644 --- a/.gitlab/includes/gcc10_apex_pipeline.yml +++ b/.gitlab/includes/gcc10_apex_pipeline.yml @@ -22,24 +22,24 @@ include: gcc10_apex_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc10_apex_config + - .compiler_image_template gcc10_apex_spack_image: needs: [gcc10_apex_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc10_apex_config + - .dependencies_image_template gcc10_apex_release_build: needs: [gcc10_apex_spack_image] extends: - - .build_template - .variables_gcc10_apex_config + - .build_template gcc10_apex_release_test: needs: [gcc10_apex_release_build] extends: - - .test_template - - .test_common_mc - .variables_gcc10_apex_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/gcc11_pipeline.yml b/.gitlab/includes/gcc11_pipeline.yml index 5f2b542863..3639e7f67e 100644 --- a/.gitlab/includes/gcc11_pipeline.yml +++ b/.gitlab/includes/gcc11_pipeline.yml @@ -22,14 +22,14 @@ include: gcc11_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc11_config + - .compiler_image_template gcc11_spack_image: needs: [gcc11_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc11_config + - .dependencies_image_template gcc11_debug_build: needs: [gcc11_spack_image] @@ -40,6 +40,6 @@ gcc11_debug_build: gcc11_debug_test: needs: [gcc11_debug_build] extends: - - .test_template - - .test_common_mc - .variables_gcc11_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/gcc12_cuda12_pipeline.yml b/.gitlab/includes/gcc12_cuda12_pipeline.yml index 3db32af331..7006c2daec 100644 --- a/.gitlab/includes/gcc12_cuda12_pipeline.yml +++ b/.gitlab/includes/gcc12_cuda12_pipeline.yml @@ -25,26 +25,26 @@ include: gcc12_cuda12_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc12_cuda12_config + - .compiler_image_template gcc12_cuda12_spack_image: needs: [gcc12_cuda12_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc12_cuda12_config + - .dependencies_image_template gcc12_cuda12_debug_build: needs: [gcc12_cuda12_spack_image] extends: - - .build_template - .variables_gcc12_cuda12_config + - .build_template # Test step currently commented as the cuda driver is too old on clariden: # https://github.com/pika-org/pika/issues/884 #gcc12_cuda12_debug_test: # needs: [gcc12_cuda12_debug_build] # extends: -# - .test_template -# - .test_common_gpu_clariden_cuda # - .variables_gcc12_cuda12_config +# - .test_common_gpu_clariden_cuda +# - .test_template diff --git a/.gitlab/includes/gcc12_hip5_pipeline.yml b/.gitlab/includes/gcc12_hip5_pipeline.yml index 10de484753..f3ee4b9c7a 100644 --- a/.gitlab/includes/gcc12_hip5_pipeline.yml +++ b/.gitlab/includes/gcc12_hip5_pipeline.yml @@ -24,26 +24,25 @@ include: gcc12_hip5_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc12_hip5_config + - .compiler_image_template gcc12_hip5_spack_image: timeout: 4 hours needs: [gcc12_hip5_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc12_hip5_config + - .dependencies_image_template gcc12_hip5_debug_build: needs: [gcc12_hip5_spack_image] extends: - - .build_template - .variables_gcc12_hip5_config + - .build_template gcc12_hip5_debug_test: needs: [gcc12_hip5_debug_build] extends: - - .test_template - - .test_common_gpu_clariden_hip - .variables_gcc12_hip5_config - - .cmake_variables_common + - .test_common_gpu_clariden_hip + - .test_template diff --git a/.gitlab/includes/gcc12_pipeline.yml b/.gitlab/includes/gcc12_pipeline.yml index 50abde76d4..52caaf5c6b 100644 --- a/.gitlab/includes/gcc12_pipeline.yml +++ b/.gitlab/includes/gcc12_pipeline.yml @@ -21,24 +21,24 @@ include: gcc12_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc12_config + - .compiler_image_template gcc12_spack_image: needs: [gcc12_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc12_config + - .dependencies_image_template gcc12_debug_build: needs: [gcc12_spack_image] extends: - - .build_template - .variables_gcc12_config + - .build_template gcc12_debug_test: needs: [gcc12_debug_build] extends: - - .test_template - - .test_common_mc - .variables_gcc12_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/gcc13_pipeline.yml b/.gitlab/includes/gcc13_pipeline.yml index 27058f91db..ab70ac5cbd 100644 --- a/.gitlab/includes/gcc13_pipeline.yml +++ b/.gitlab/includes/gcc13_pipeline.yml @@ -23,24 +23,24 @@ include: gcc13_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc13_config + - .compiler_image_template gcc13_spack_image: needs: [gcc13_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc13_config + - .dependencies_image_template gcc13_debug_build: needs: [gcc13_spack_image] extends: - - .build_template - .variables_gcc13_config + - .build_template gcc13_debug_test: needs: [gcc13_debug_build] extends: - - .test_template - - .test_common_mc - .variables_gcc13_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/gcc9_cuda11_pipeline.yml b/.gitlab/includes/gcc9_cuda11_pipeline.yml index 3e47d0cacc..609a07a03b 100644 --- a/.gitlab/includes/gcc9_cuda11_pipeline.yml +++ b/.gitlab/includes/gcc9_cuda11_pipeline.yml @@ -22,24 +22,24 @@ include: gcc9_cuda11_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc9_cuda11_config + - .compiler_image_template gcc9_cuda11_spack_image: needs: [gcc9_cuda11_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc9_cuda11_config + - .dependencies_image_template gcc9_cuda11_debug_build: needs: [gcc9_cuda11_spack_image] extends: - - .build_template - .variables_gcc9_cuda11_config + - .build_template gcc9_cuda11_debug_test: needs: [gcc9_cuda11_debug_build] extends: - - .test_template - - .test_common_gpu_clariden_cuda - .variables_gcc9_cuda11_config + - .test_common_gpu_clariden_cuda + - .test_template diff --git a/.gitlab/includes/gcc9_pipeline.yml b/.gitlab/includes/gcc9_pipeline.yml index 81a3e8291b..c2a11d025d 100644 --- a/.gitlab/includes/gcc9_pipeline.yml +++ b/.gitlab/includes/gcc9_pipeline.yml @@ -22,24 +22,24 @@ include: gcc9_spack_compiler_image: extends: - - .compiler_image_template - .variables_gcc9_config + - .compiler_image_template gcc9_spack_image: needs: [gcc9_spack_compiler_image] extends: - - .dependencies_image_template - .variables_gcc9_config + - .dependencies_image_template gcc9_debug_build: needs: [gcc9_spack_image] extends: - - .build_template - .variables_gcc9_config + - .build_template gcc9_debug_test: needs: [gcc9_debug_build] extends: - - .test_template - - .test_common_mc - .variables_gcc9_config + - .test_common_mc + - .test_template diff --git a/.gitlab/includes/performance_gcc13_pipeline.yml b/.gitlab/includes/performance_gcc13_pipeline.yml index 15a8ad2570..74b51a28f7 100644 --- a/.gitlab/includes/performance_gcc13_pipeline.yml +++ b/.gitlab/includes/performance_gcc13_pipeline.yml @@ -20,20 +20,20 @@ include: performance_gcc13_spack_compiler_image: extends: - - .compiler_image_template - .variables_performance_gcc13_config + - .compiler_image_template performance_gcc13_spack_image: needs: [performance_gcc13_spack_compiler_image] extends: - - .dependencies_image_template - .variables_performance_gcc13_config + - .dependencies_image_template performance_gcc13_release_build: needs: [performance_gcc13_spack_image] extends: - - .build_template - .variables_performance_gcc13_config + - .build_template performance_gcc13_release_test: extends: