Renew CI specs per #15

LLNL · Jan 27, 2023 · 78dc0bb · 78dc0bb
1 parent 872eb38
commit 78dc0bb
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 59 deletions.
diff --git a/corona-build-and-test.yml b/corona-build-and-test.yml
@@ -112,9 +112,9 @@ status_pending:
     - export pipeline_status="pending"
     - *status_report
 
-rocm_5_1_1_clang_13_0_0:
+rocm_5_4_1_clang_15_0_0:
   variables:
-    SPEC: "${PROJECT_CORONA_VARIANTS} +rocm amdgpu_target=gfx906 %clang@13.0.0 ^hip@5.1.1 ${PROJECT_CORONA_DEPS}"
+    SPEC: "${PROJECT_CORONA_VARIANTS} +rocm amdgpu_target=gfx906 %clang@15.0.0 ^hip@5.4.1 ${PROJECT_CORONA_DEPS}"
   extends: .build_and_test_on_corona
 
 # In post-build phase, deallocate resources.

diff --git a/lassen-build-and-test.yml b/lassen-build-and-test.yml
@@ -91,54 +91,38 @@ status_pending:
     - export pipeline_status="pending"
     - *status_report
 
-# Gitlab jobs for the lassen machine at ${GITHUB_PROJECT_ORG}.
-
-# CPU only.
-ibm_clang_9_0_0:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %clang@ibm.9.0.0 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-ibm_clang_9_0_0_gcc_8_3_1:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-gcc_8_3_1:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %gcc@8.3.1 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-pgi_20_4_gcc_8_3_1:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %pgi@20.4 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-xl_16_1_1_12:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %xl@16.1.1.12 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-xl_16_1_1_12_gcc_8_3_1:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
 
 # CUDA.
-ibm_clang_9_0_0_gcc_8_3_1_cuda_10_1_168:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@ibm.9.0.0 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
-
-xl_16_1_1_12_gcc_7_3_1_cuda_10_1_168:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-7.3.1\" ^cuda@10.1.168 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
+clang_12_0_1_gcc_8_3_1_cuda_10_1_243:
+variables:
+  SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@12.0.1.gcc.8.3.1 ^cuda@10.1.243 ${PROJECT_LASSEN_DEPS}"
+extends: .build_and_test_on_lassen
+
+clang_12_0_1_cuda_11_2_0:
+variables:
+  SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@12.0.1 ^cuda@10.1.243 ${PROJECT_LASSEN_DEPS}"
+extends: .build_and_test_on_lassen
+
+clang_14_0_5_gcc_8_3_1_cuda_11_7_0:
+variables:
+  SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %clang@12.0.1.gcc.8.3.1 ^cuda@11.7.0 ${PROJECT_LASSEN_DEPS}"
+extends: .build_and_test_on_lassen
+
+xl_2022_08_19_cuda_11_2_0:
+variables:
+  SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 ^cuda@11.2.0 ${PROJECT_LASSEN_DEPS}"
+extends: .build_and_test_on_lassen
+
+xl_2022_08_19_cuda_11_7_0:
+variables:
+  SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 ^cuda@11.7.0 ${PROJECT_LASSEN_DEPS}"
+extends: .build_and_test_on_lassen
+
+gcc_8_3_1_cuda_11_7_0:
+variables:
+  SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %gcc@8.3.1 ^cuda@11.7.0 ${PROJECT_LASSEN_DEPS}"
+extends: .build_and_test_on_lassen
 
-xl_16_1_1_12_gcc_8_3_1_cuda_11_0_2:
-  variables:
-    SPEC: "${PROJECT_LASSEN_VARIANTS} +cuda %xl@16.1.1.12 cxxflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" cflags==\"--gcc-toolchain=/usr/tce/packages/gcc/gcc-8.3.1\" ^cuda@11.0.2 ${PROJECT_LASSEN_DEPS}"
-  extends: .build_and_test_on_lassen
 
 status_success:
   extends: [.on_lassen]

diff --git a/ruby-build-and-test.yml b/ruby-build-and-test.yml
@@ -109,29 +109,34 @@ status_pending:
     - *status_report
 
 # Gitlab jobs for the Ruby machine at ${GITHUB_PROJECT_ORG}.
-clang_10_0_1:
+intel_19_1_2_gcc_8_3_1:
   variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} %clang@10.0.1 ${PROJECT_RUBY_DEPS}"
+    SPEC: "${PROJECT_RUBY_VARIANTS} %intel@19.1.2.gcc.8.3.1 ${PROJECT_RUBY_DEPS}"
   extends: .build_and_test_on_ruby
 
-clang_9_0_0:
+intel_oneapi_2022_3:
   variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} %clang@9.0.0 ${PROJECT_RUBY_DEPS}"
+    SPEC: "${PROJECT_RUBY_VARIANTS} %oneapi@2022.3 ${PROJECT_RUBY_DEPS}"
   extends: .build_and_test_on_ruby
 
-gcc_8_1_0:
+clang_12_0_1_gcc_8_3_1:
   variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} %gcc@8.1.0 ${PROJECT_RUBY_DEPS}"
+    SPEC: "${PROJECT_RUBY_VARIANTS} %clang@12.0.1.gcc.8.3.1 ${PROJECT_RUBY_DEPS}"
   extends: .build_and_test_on_ruby
 
-icpc_19_1_0:
+clang_14_0_4:
   variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} %intel@19.1.0 ${PROJECT_RUBY_DEPS}"
+    SPEC: "${PROJECT_RUBY_VARIANTS} %clang@14.0.4 ${PROJECT_RUBY_DEPS}"
   extends: .build_and_test_on_ruby
 
-pgi_20_1_gcc_local_8_3_1:
+gcc_8_3_1:
   variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} %pgi@20.1 cxxflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" cflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" fflags==\"-rc=/usr/workspace/umpire/pgi/x86_64/local-gcc-8.3.1-rc\" ${PROJECT_RUBY_DEPS}"
+    SPEC: "${PROJECT_RUBY_VARIANTS} %gcc@8.3.1 ${PROJECT_RUBY_DEPS}"
+  extends: .build_and_test_on_ruby
+
+gcc_10_2_1:
+  variables:
+    SPEC: "${PROJECT_RUBY_VARIANTS} %gcc@10.2.1 ${PROJECT_RUBY_DEPS}"
   extends: .build_and_test_on_ruby
 
 # In post-build phase, deallocate resources.

diff --git a/tioga-build-and-test.yml b/tioga-build-and-test.yml
@@ -112,9 +112,14 @@ status_pending:
     - export pipeline_status="pending"
     - *status_report
 
-rocm_5_2_3_clang_13_0_0:
+rocm_5_4_2_clang_15_0_0:
   variables:
-    SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %clang@13.0.0 ^hip@5.2.3 ${PROJECT_TIOGA_DEPS}"
+    SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %clang@15.0.0 ^hip@5.4.2 ${PROJECT_TIOGA_DEPS}"
+  extends: .build_and_test_on_tioga
+
+cce_15_0_0c:
+  variables:
+    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@15.0.0.c ${PROJECT_TIOGA_DEPS}"
   extends: .build_and_test_on_tioga
 
 # In post-build phase, deallocate resources.