Merge pull request #223 from LLNL/rc-2023.06.0

2023.06.0 Release

.gitlab-ci.yml

@@ -3,15 +3,26 @@ variables:
   ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID}
   BUILD_ROOT: ${CI_PROJECT_DIR}
   SPHERAL_BUILDS_DIR: /usr/WS2/sphapp/.jacamar-ci/spheral-builds
+
   SCRIPT_DIR: "scripts"
   ATS_FILE: "tests/integration.ats"
+  SPHERAL_MODULE: "Spheral"
+  SPACK_NAME: spheral
+  SPACK_PKG_NAME: spheral
+
+.spheral_rev_str:
+  before_script:
+    - SPHERAL_REV=$(git rev-list --count HEAD)
+    - SPHERAL_REV_STR="$SPHERAL_REV"
 
 stages:
   - build_and_install
   - run_ats
-  - cleanup
   - update_tpls
+  - generate_buildcache
+  - install_production
   - update_permissions
+  - cleanup
 
 include:
   - local: .gitlab/os.yml
@@ -20,3 +31,4 @@ include:
   - local: .gitlab/specs.yml
   - local: .gitlab/jobs-mpi.yml
   - local: .gitlab/jobs-seq.yml
+  - local: .gitlab/jobs-prod.yml

.gitlab/jobs-mpi.yml

@@ -1,26 +1,26 @@
 # ------------------------------------------------------------------------------
 # BUILD JOBS
 
-toss_gcc_8_3_1_mvapich2_Debug_build:
-  extends: [.gcc_8_3_1_mvapich2_CXXONLY, .build_and_test, .toss_resource1]
+toss_gcc_mvapich2_cxxonly_build:
+  extends: [.toss_resource1, .gcc_mvapich2_cxxonly, .build]
 
 
 
-toss_gcc_8_3_1_mvapich2_build:
-  extends: [.gcc_8_3_1_mvapich2, .build_and_test, .toss_resource2]
+toss_gcc_mvapich2_build:
+  extends: [.toss_resource2, .gcc_mvapich2, .build_and_test]
 
-toss_gcc_8_3_1_mvapich2_test:
-  extends: [.gcc_8_3_1_mvapich2, .run_ats, .toss_resource2]
-  needs: [toss_gcc_8_3_1_mvapich2_build]
+toss_gcc_mvapich2_test:
+  extends: [.toss_resource2, .gcc_mvapich2, .run_ats]
+  needs: [toss_gcc_mvapich2_build]
 
 
 
-toss_clang_9_0_0_mvapich2_build:
-  extends: [.clang_9_0_0_mvapich2, .build_and_test, .toss_resource1]
+toss_clang_mvapich2_build:
+  extends: [.toss_resource1, .clang_mvapich2, .build_and_test]
 
-toss_clang_9_0_0_mvapich2_test:
-  extends: [.clang_9_0_0_mvapich2, .run_ats, .toss_resource2]
-  needs: [toss_clang_9_0_0_mvapich2_build]
+toss_clang_mvapich2_test:
+  extends: [.toss_resource2, .clang_mvapich2, .run_ats]
+  needs: [toss_clang_mvapich2_build]
 
 
 
@@ -29,42 +29,22 @@ toss_clang_9_0_0_mvapich2_test:
 
 
 
-blueos_gcc_8_3_1_spectrum_build:
-  extends: [.gcc_8_3_1_spectrum, .build_and_test, .blueos_resource1]
+blueos_gcc_spectrum_build:
+  extends: [.blueos_resource1, .gcc_spectrum, .build_and_test]
 
-blueos_gcc_8_3_1_spectrum_test:
-  extends: [.gcc_8_3_1_spectrum, .run_ats, .blueos_resource1]
-  needs: [blueos_gcc_8_3_1_spectrum_build]
+blueos_gcc_spectrum_test:
+  extends: [.blueos_resource1, .gcc_spectrum, .run_ats]
+  needs: [blueos_gcc_spectrum_build]
 
 
 
-blueos_cuda_11_gcc_8_3_1_spectrum_build:
-  extends: [.cuda_11_gcc_8_3_1_spectrum, .build_and_test, .blueos_resource2]
+blueos_cuda_11_gcc_spectrum_build:
+  extends: [.blueos_resource2, .cuda_11_gcc_spectrum, .build_and_test]
 
-blueos_cuda_11_gcc_8_3_1_spectrum_test:
-  extends: [.cuda_11_gcc_8_3_1_spectrum, .run_ats, .blueos_resource2]
-  needs: [blueos_cuda_11_gcc_8_3_1_spectrum_build]
+blueos_cuda_11_gcc_spectrum_test:
+  extends: [.blueos_resource2, .cuda_11_gcc_spectrum, .run_ats]
+  needs: [blueos_cuda_11_gcc_spectrum_build]
   allow_failure: true
 
 
-# ------------------------------------------------------------------------------
-# CLEAN OLD BUILD DIRS
-
-cleanup_build_dirs:
-  extends: [.clean_dirs]
-
-
-# ------------------------------------------------------------------------------
-# UPDATE TPL JOBS
-
-blueos_update_tpls:
-  extends: [.blueos_resource2, .update_tpls, .merge_pr_rule]
-
-toss_update_tpls:
-  extends: [.toss_resource2, .update_tpls, .merge_pr_rule]
-
-# ------------------------------------------------------------------------------
-# UPDATE PERM JOBS
 
-toss_update_permissions:
-  extends: [.toss_resource_general, .toss_update_permissions, .merge_pr_rule]

.gitlab/jobs-prod.yml

@@ -0,0 +1,39 @@
+# ------------------------------------------------------------------------------
+# UPDATE TPL JOBS
+
+toss_update_tpls:
+  extends: [.toss_resource2, .update_tpls, .merge_pr_rule]
+
+blueos_update_tpls:
+  extends: [.blueos_resource2, .update_tpls, .merge_pr_rule]
+  needs: [toss_update_tpls]
+
+# ------------------------------------------------------------------------------
+# UPDATE PERM JOBS
+
+shared_tpls_update_permissions:
+  extends: [.toss_resource_general, .toss_update_permissions, .merge_pr_rule]
+
+# ------------------------------------------------------------------------------
+# PROD BUILD JOBS
+
+### TAG RELEASE ###
+toss_build_dev_pkg_release:
+  extends: [.toss_resource_general, .gcc_mvapich2, .build_dev_pkg, .tag_release_rule]
+
+toss_install_dev_pkg_release:
+  extends: [.toss_resource_general, .gcc_mvapich2, .install_dev_pkg, .tag_release_rule]
+  needs: [toss_build_dev_pkg_release]
+
+toss_release_permissions:
+  variables:
+    ALIAS: $CI_COMMIT_TAG
+  extends: [.toss_resource_general, .prod_permissions, .tag_release_rule]
+  needs: [toss_install_dev_pkg_release]
+
+# ------------------------------------------------------------------------------
+# CLEAN OLD BUILD DIRS
+
+cleanup_build_dirs:
+  extends: [.clean_dirs]
+

.gitlab/jobs-seq.yml

@@ -1,26 +1,25 @@
 # ------------------------------------------------------------------------------
 # BUILD JOBS
 
-toss_gcc_8_3_1_~mpi_build:
-  extends: [.gcc_8_3_1_~mpi, .build_and_test, .toss_resource1]
-
-toss_gcc_8_3_1_~mpi_test:
-  extends: [.gcc_8_3_1_~mpi, .run_ats, .toss_resource1]
-  needs: [toss_gcc_8_3_1_~mpi_build]
+toss_gcc_~mpi_build:
+  extends: [.gcc_~mpi, .build_and_test, .toss_resource1]
 
+toss_gcc_~mpi_test:
+  extends: [.gcc_~mpi, .run_ats, .toss_resource1]
+  needs: [toss_gcc_~mpi_build]
 
 
-blueos_cuda_11_gcc_8_3_1_~mpi_build:
-  extends: [.cuda_11_gcc_8_3_1_~mpi, .build_and_test, .blueos_resource2]
+blueos_cuda_11_gcc_~mpi_build:
+  extends: [.blueos_resource2, .cuda_11_gcc_~mpi, .build_and_test]
 
-blueos_cuda_11_gcc_8_3_1_~mpi_test:
-  extends: [.cuda_11_gcc_8_3_1_~mpi, .run_ats, .blueos_resource2]
-  needs: [blueos_cuda_11_gcc_8_3_1_~mpi_build]
+blueos_cuda_11_gcc_~mpi_test:
+  extends: [.blueos_resource2, .cuda_11_gcc_~mpi, .run_ats]
+  needs: [blueos_cuda_11_gcc_~mpi_build]
 
 
-blueos_gcc_8_3_1_~mpi_Debug_build:
-  extends: [.gcc_8_3_1_~mpi_Debug, .build_and_test, .blueos_resource1]
+blueos_gcc_~mpi_Debug_build:
+  extends: [.blueos_resource1, .gcc_~mpi_Debug, .build_and_test]
 
-blueos_gcc_8_3_1_~mpi_Debug_test:
-  extends: [.gcc_8_3_1_~mpi_Debug, .run_ats, .blueos_resource1]
-  needs: [blueos_gcc_8_3_1_~mpi_Debug_build]
+blueos_gcc_~mpi_Debug_test:
+  extends: [.blueos_resource1, .gcc_~mpi_Debug, .run_ats]
+  needs: [blueos_gcc_~mpi_Debug_build]

.gitlab/machines.yml

@@ -6,21 +6,21 @@
     - ruby
     - shell
   variables:
-    HOSTNAME: "ruby"
+    HOSTNAME: 'ruby'
     PARTITION: pdebug
     BUILD_ALLOC: srun -N 1 -c 36 -p pdebug -t 60
-    TEST_ALLOC: ""
-  extends: [.on_toss]
+    TEST_ALLOC: ''
+  extends: [.on_toss_4_x86]
 
 .on_lassen:
   tags:
     - lassen
     - shell
   variables:
-    HOSTNAME: "lassen"
-    BUILD_ALLOC: lalloc 1
+    HOSTNAME: 'lassen'
+    BUILD_ALLOC: lalloc 1 -W 60
     TEST_ALLOC: $BUILD_ALLOC
-  extends: [.on_blueos]
+  extends: [.on_blueos_3_ppc64]
 
 # ------------------------------------------------------------------------------
 

.gitlab/os.yml

@@ -5,15 +5,26 @@
   variables:
     LLNL_SERVICE_USER: sphapp
     UPSTREAM_DIR: /usr/WS2/wciuser/Spheral/spheral-spack-tpls
-    DISPLAY: ":0.0"
+    DISPLAY: ':0.0'
 
-.on_toss:
+.on_toss_3_x86:
   variables:
-    ARCH: "toss_3_x86_64_ib"
+    ARCH: 'toss_3_x86_64_ib'
+    GCC_VERSION: '8.3.1'
+    CLANG_VERSION: '9.0.0'
   extends: [.sys_config]
 
-.on_blueos:
+.on_toss_4_x86:
   variables:
-    ARCH: "blueos_3_ppc64le_ib_p9"
+    ARCH: 'toss_4_x86_64_ib'
+    GCC_VERSION: '10.3.1'
+    CLANG_VERSION: '14.0.6'
+  extends: [.sys_config]
+
+.on_blueos_3_ppc64:
+  variables:
+    ARCH: 'blueos_3_ppc64le_ib_p9'
+    GCC_VERSION: '8.3.1'
+    CLANG_VERSION: '9.0.0'
   extends: [.sys_config]