Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[develop] Update ufs-weather-model hash and further clean the machines tested in PULL_REQUEST_TEMPLATE #1096

Merged
merged 15 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1259aba
[feature/hash_update] Update weather model hash to 485ccdf (from June 5)
MichaelLueken Jun 7, 2024
e1a0cf1
[feature/hash_update] update PULL_REQUEST_TEMPLATE to consolidate Tie…
MichaelLueken Jun 11, 2024
bd6cd97
Merge remote-tracking branch 'upstream/develop' into feature/hash_update
MichaelLueken Jun 21, 2024
f6de84e
[feature/hash_update] Apply PULL_REQUEST_TEMPLATE updates to Contribu…
MichaelLueken Jun 27, 2024
9b4e263
Merge remote-tracking branch 'upstream/develop' into feature/hash_update
MichaelLueken Jul 12, 2024
dbf0372
Merge remote-tracking branch 'upstream/develop' into feature/hash_update
MichaelLueken Jul 26, 2024
cacbea4
Merge remote-tracking branch 'upstream/develop' into feature/hash_update
MichaelLueken Jul 30, 2024
4c71aae
[feature/hash_update] Update verification scripts to address KeyError…
MichaelLueken Jul 30, 2024
2b8b292
[feature/hash_update] Update Jenkinsfile to address Functional Workfl…
MichaelLueken Jul 30, 2024
3ed69ec
[feature/hash_update] Update the Jenkinsfile to only run on Hera Inte…
MichaelLueken Jul 30, 2024
55fb2ff
[feature/hash_update] Removing the TASK_DEPTH axis entry from Jenkins…
MichaelLueken Jul 30, 2024
4b7fcb8
[feature/hash_update] Add back in removed machines and compilers (tha…
MichaelLueken Jul 31, 2024
e5c22ac
[feature/hash_update] Update ufs-weather-model hash to b5a1976 (July 30)
MichaelLueken Jul 31, 2024
e5eef30
Merge remote-tracking branch 'upstream/develop' into feature/hash_update
MichaelLueken Aug 9, 2024
c65bc57
[feature/hash_update] Update modulefiles/tasks/noaacloud/plot_allvars…
MichaelLueken Aug 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cicd/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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})"
Expand Down
10 changes: 4 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@
<!-- Explicitly state what tests were run on these changes, or if any are still pending (for README or other text-only changes, just put "None required"). Make note of the compilers used, the platform/machine, and other relevant details as necessary. For more complicated changes, or those resulting in scientific changes, please be explicit! -->
<!-- Add an X to check off a box. -->

- [ ] 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
Expand Down
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 4 additions & 6 deletions doc/ContribGuide/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,13 @@ Here is the template that is provided when developers click "Create pull request
<!-- Explicitly state what tests were run on these changes, or if any are still pending (for README or other text-only changes, just put "None required"). Make note of the compilers used, the platform/machine, and other relevant details as necessary. For more complicated changes, or those resulting in scientific changes, please be explicit! -->
<!-- Add an X to check off a box. -->

- [ ] 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
Expand Down
7 changes: 2 additions & 5 deletions modulefiles/tasks/noaacloud/plot_allvars.local.lua
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion scripts/exregional_run_met_genensprod_or_ensemblestat.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_run_met_gridstat_or_pointstat_vx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
3 changes: 1 addition & 2 deletions scripts/exregional_run_met_pb2nc_obs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_run_met_pcpcombine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Loading