From 7e8213f7aea91f3948a5f98bddcd0b6103a248a2 Mon Sep 17 00:00:00 2001 From: Michael Lueken <63728921+MichaelLueken@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:29:41 -0400 Subject: [PATCH] [develop] Update ufs-weather-model hash and further clean the machines tested in PULL_REQUEST_TEMPLATE (#1096) * Update ufs-weather-model hash to b5a1976 (July 30) * Add hera.gnu, remove cheyenne.intel, cheyenne.gnu, and gaeac5.intel, and alphabetize the machines in the TESTS CONDUCTED section of the PULL_REQUEST_TEMPLATE * Correct behavior of Jenkins Functional WorkflowTaskTests. Currently, TASK_DEPTH is set to null, resulting in no tests being run during the Functional WorkflowTaskTests stage. Replaced env with params in Jenkinsfile for setting TASK_DEPTH. Testing shows that this will correctly set TASK_DEPTH to the default value of 9 and allow the tests to run * Removed extraneous entries from the verification scripts to remove KeyError messages in the associated verification log files * Reapplied necessary modification to modulefiles/tasks/noaacloud/plot_allvars.local.lua to allow plotting tasks to run on NOAA cloud platforms --- .cicd/Jenkinsfile | 4 ++-- .github/PULL_REQUEST_TEMPLATE | 10 ++++------ Externals.cfg | 2 +- doc/ContribGuide/contributing.rst | 10 ++++------ modulefiles/tasks/noaacloud/plot_allvars.local.lua | 7 ++----- .../exregional_run_met_genensprod_or_ensemblestat.sh | 2 +- scripts/exregional_run_met_gridstat_or_pointstat_vx.sh | 2 +- ...egional_run_met_gridstat_or_pointstat_vx_ensmean.sh | 2 +- ...egional_run_met_gridstat_or_pointstat_vx_ensprob.sh | 2 +- scripts/exregional_run_met_pb2nc_obs.sh | 3 +-- scripts/exregional_run_met_pcpcombine.sh | 2 +- 11 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 030661bd27..e6ed9515f2 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -193,9 +193,9 @@ pipeline { // Try a few Workflow Task scripts to make sure E2E tests can be launched in a follow-on 'Test' stage stage('Functional WorkflowTaskTests') { environment { - TASK_DEPTH = "${env.SRW_WRAPPER_TASK_DEPTH}" + TASK_DEPTH = "${params.SRW_WRAPPER_TASK_DEPTH}" } - + steps { dir ("${env.SRW_PLATFORM}") { echo "Running ${TASK_DEPTH} simple workflow script task tests on ${env.SRW_PLATFORM} (using ${env.WORKSPACE}/${env.SRW_PLATFORM})" diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 1c363c651f..29a878d4a4 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -30,15 +30,13 @@ -- [ ] hera.intel -- [ ] orion.intel -- [ ] hercules.intel -- [ ] cheyenne.intel -- [ ] cheyenne.gnu - [ ] derecho.intel - [ ] gaea.intel -- [ ] gaeac5.intel +- [ ] hera.gnu +- [ ] hera.intel +- [ ] hercules.intel - [ ] jet.intel +- [ ] orion.intel - [ ] wcoss2.intel - [ ] NOAA Cloud (indicate which platform) - [ ] Jenkins diff --git a/Externals.cfg b/Externals.cfg index 25ec5f79b9..4545cd8ca5 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -12,7 +12,7 @@ protocol = git repo_url = https://github.com/ufs-community/ufs-weather-model # Specify either a branch name or a hash but not both. #branch = develop -hash = 1c6b4d4 +hash = b5a1976 local_path = sorc/ufs-weather-model required = True diff --git a/doc/ContribGuide/contributing.rst b/doc/ContribGuide/contributing.rst index ed1671363e..eb995efb41 100644 --- a/doc/ContribGuide/contributing.rst +++ b/doc/ContribGuide/contributing.rst @@ -227,15 +227,13 @@ Here is the template that is provided when developers click "Create pull request - - [ ] hera.intel - - [ ] orion.intel - - [ ] hercules.intel - - [ ] cheyenne.intel - - [ ] cheyenne.gnu - [ ] derecho.intel - [ ] gaea.intel - - [ ] gaeac5.intel + - [ ] hera.gnu + - [ ] hera.intel + - [ ] hercules.intel - [ ] jet.intel + - [ ] orion.intel - [ ] wcoss2.intel - [ ] NOAA Cloud (indicate which platform) - [ ] Jenkins diff --git a/modulefiles/tasks/noaacloud/plot_allvars.local.lua b/modulefiles/tasks/noaacloud/plot_allvars.local.lua index 2fd9b41eb5..85291013c7 100644 --- a/modulefiles/tasks/noaacloud/plot_allvars.local.lua +++ b/modulefiles/tasks/noaacloud/plot_allvars.local.lua @@ -1,5 +1,2 @@ -unload("python") -append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -setenv("SRW_GRAPHICS_ENV", "regional_workflow") +load("conda") +setenv("SRW_GRAPHICS_ENV", "srw_graphics") diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh index 05503bb963..1c09dc09c6 100755 --- a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh +++ b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh @@ -10,7 +10,7 @@ . $USHdir/source_util_funcs.sh for sect in user nco platform workflow nco global verification cpl_aqm_parm \ constants fixed_files grid_params \ - task_run_post task_run_vx_ensgrid ; do + task_run_post ; do source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect} done # diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh index 03c6093943..abe5e3dd31 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh @@ -10,7 +10,7 @@ . $USHdir/source_util_funcs.sh for sect in user nco platform workflow nco global verification cpl_aqm_parm \ constants fixed_files grid_params \ - task_run_post task_run_vx_gridstat task_run_vx_pointstat ; do + task_run_post ; do source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect} done # diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh index 12a54dc21b..2c8378c128 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh @@ -10,7 +10,7 @@ . $USHdir/source_util_funcs.sh for sect in user nco platform workflow nco global verification cpl_aqm_parm \ constants fixed_files grid_params \ - task_run_post task_run_vx_ensgrid_mean task_run_vx_enspoint_mean ; do + task_run_post ; do source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect} done # diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh index 8fd4a59dfe..eae1850ad8 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh @@ -10,7 +10,7 @@ . $USHdir/source_util_funcs.sh for sect in user nco platform workflow nco global verification cpl_aqm_parm \ constants fixed_files grid_params \ - task_run_vx_ensgrid_prob task_run_vx_enspoint_prob task_run_post ; do + task_run_post ; do source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect} done # diff --git a/scripts/exregional_run_met_pb2nc_obs.sh b/scripts/exregional_run_met_pb2nc_obs.sh index 5281021f01..7e79fb4efb 100755 --- a/scripts/exregional_run_met_pb2nc_obs.sh +++ b/scripts/exregional_run_met_pb2nc_obs.sh @@ -9,8 +9,7 @@ # . $USHdir/source_util_funcs.sh for sect in user nco platform workflow nco global verification cpl_aqm_parm \ - constants fixed_files grid_params \ - task_run_met_pb2nc_obs ; do + constants fixed_files grid_params ; do source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect} done # diff --git a/scripts/exregional_run_met_pcpcombine.sh b/scripts/exregional_run_met_pcpcombine.sh index ce9e78ab17..026afb4eb2 100755 --- a/scripts/exregional_run_met_pcpcombine.sh +++ b/scripts/exregional_run_met_pcpcombine.sh @@ -10,7 +10,7 @@ . $USHdir/source_util_funcs.sh for sect in user nco platform workflow nco global verification cpl_aqm_parm \ constants fixed_files grid_params \ - task_run_met_pcpcombine task_run_post ; do + task_run_post ; do source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect} done #