Merge branch 'develop' of github.com:NOAA-EPIC/global-workflow-cloud into feature/adjust_tasks_per_node_layout

* 'develop' of github.com:NOAA-EPIC/global-workflow-cloud:
  Ctest case updates (#4118)
  Consolidate load_*_modules scripts into a generic load_modules.sh script (#4126)
  Updates for Gaea C6 following OS upgrade (#4110)

Author: weihuang-jedi

.github/CODEOWNERS

@@ -173,11 +173,7 @@ ush/interp_atmos_master.sh @aerorahul @WenMeng-NOAA
 ush/interp_atmos_sflux.sh @aerorahul @WenMeng-NOAA
 ush/jjob_header.sh
 ush/link_crtm_fix.sh
-ush/load_fv3gfs_modules.sh @aerorahul
-ush/load_gw_run_modules.sh @aerorahul @DavidHuber-NOAA
-ush/load_gw_gsi_modules.sh @aerorahul @DavidHuber-NOAA @RussTreadon-NOAA
-ush/load_ufsda_modules.sh @aerorahul @CoryMartin-NOAA
-ush/load_ufswm_modules.sh @aerorahul @JessicaMeixner-NOAA
+dev/ush/load_modules.sh @aerorahul @DavidHuber-NOAA @RussTreadon-NOAA @JessicaMeixner-NOAA
 ush/merge_fv3_aerosol_tile.py
 ush/minmon_xtrct_*.pl @EdwardSafford-NOAA
 ush/module-setup.sh @aerorahul

.gitignore

@@ -56,6 +56,7 @@ parm/gdas/ioda
 parm/gdas/marine
 parm/gdas/snow
 parm/gdas/soca
+parm/gdas/spoc
 parm/gdas/stat
 parm/gdas/jcb-gdas
 parm/gdas/jcb-algorithms
@@ -177,7 +178,7 @@ ush/python/ufsda
 ush/python/soca
 ush/python/gen_bufr2ioda_json.py
 ush/python/gen_bufr2ioda_yaml.py
-dev/ush/load_fv3gfs_modules.sh
+ush/spoc
 # ush log file
 ush/fetch-fix-data.log
 

dev/ci/gitlab-ci-hosts.yml

@@ -248,7 +248,13 @@ finalize_success-ursa:
   stage: run_tests
   parallel:
     matrix:
-      - CTEST_NAME: ['C48_ATM_gfs_fcst_seg0', 'C48_S2SW_gfs_fcst_seg0']
+      - CTEST_NAME:
+        - C48_ATM-gfs_fcst_seg0
+        - C48_ATM-gfs_atmos_prod_f000-f002
+        - C48_S2SW-gfs_fcst_seg0
+        - C48_S2SW-gfs_ocean_prod_f006
+        - C48_S2SW-gfs_ice_prod_f006
+        - C48_S2SWA_gefs-gefs_fcst_mem001_seg0
 
 # Host-specific CTest setup jobs
 setup_ctests-hera:

dev/ctests/CMakeLists.txt

@@ -72,30 +72,30 @@ function(AddJJOBTest)
                        "${novals}" "${singlevals}" "${multivals}"
                         ${ARGN})
 
-  set(TEST_NAME ${ARG_CASE}_${ARG_JOB})
+  set(TEST_NAME ${ARG_CASE}-${ARG_JOB})
   set(CASE_PATH ${HOMEgfs}/dev/ci/cases/pr)
   set(CASE_YAML ${CASE_PATH}/${ARG_CASE}.yaml)
 
   add_test(NAME test_${TEST_NAME}_setup
     COMMAND ./setup.sh ${TEST_NAME} ${CASE_YAML} ${ARG_TEST_DATE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
-  set_tests_properties(test_${TEST_NAME}_setup PROPERTIES LABELS "${ARG_CASE}_${ARG_JOB}")
+  set_tests_properties(test_${TEST_NAME}_setup PROPERTIES LABELS "${ARG_CASE}-${ARG_JOB}")
 
   add_test(NAME test_${TEST_NAME}_stage
       COMMAND ./stage.sh ${ARG_CASE} ${TEST_NAME} ${ARG_TEST_DATE}
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
-  set_tests_properties(test_${TEST_NAME}_stage PROPERTIES DEPENDS test_${TEST_NAME}_setup LABELS "${ARG_CASE}_${ARG_JOB}")
+  set_tests_properties(test_${TEST_NAME}_stage PROPERTIES DEPENDS test_${TEST_NAME}_setup LABELS "${ARG_CASE}-${ARG_JOB}")
 
   add_test(NAME test_${TEST_NAME}_execute
       COMMAND ./execute.sh ${TEST_NAME} ${ARG_JOB} ${ARG_TEST_DATE}
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
-  set_tests_properties(test_${TEST_NAME}_execute PROPERTIES DEPENDS test_${TEST_NAME}_stage LABELS "${ARG_CASE}_${ARG_JOB}")
+  set_tests_properties(test_${TEST_NAME}_execute PROPERTIES DEPENDS test_${TEST_NAME}_stage LABELS "${ARG_CASE}-${ARG_JOB}")
 
   # TODO - This is a stub for the validation step
   add_test(NAME test_${TEST_NAME}_validate
       COMMAND ./validate.sh ${ARG_CASE} ${TEST_NAME} ${ARG_TEST_DATE}
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
-  set_tests_properties(test_${TEST_NAME}_validate PROPERTIES DEPENDS test_${TEST_NAME}_execute LABELS "${ARG_CASE}_${ARG_JOB}")
+  set_tests_properties(test_${TEST_NAME}_validate PROPERTIES DEPENDS test_${TEST_NAME}_execute LABELS "${ARG_CASE}-${ARG_JOB}")
 endfunction()
 
 AddJJOBTest(
@@ -104,8 +104,32 @@ AddJJOBTest(
   TEST_DATE "2021032312"
 )
 
+AddJJOBTest(
+  CASE "C48_ATM"
+  JOB "gfs_atmos_prod_f000-f002"
+  TEST_DATE "2021032312"
+)
+
 AddJJOBTest(
   CASE "C48_S2SW"
   JOB "gfs_fcst_seg0"
   TEST_DATE "2021032312"
 )
+
+AddJJOBTest(
+  CASE "C48_S2SW"
+  JOB "gfs_ice_prod_f006"
+  TEST_DATE "2021032312"
+)
+
+AddJJOBTest(
+  CASE "C48_S2SW"
+  JOB "gfs_ocean_prod_f006"
+  TEST_DATE "2021032312"
+)
+
+AddJJOBTest(
+  CASE "C48_S2SWA_gefs"
+  JOB "gefs_fcst_mem001_seg0"
+  TEST_DATE "2021032312"
+)