From 51f4981943337ea54277f4412834ff995b30806a Mon Sep 17 00:00:00 2001
From: Bruce Kropp - Raytheon
 <104453151+BruceKropp-Raytheon@users.noreply.github.com>
Date: Fri, 31 May 2024 05:50:32 -0700
Subject: [PATCH 1/2] [develop] fix CI scripts to save logfile names that
 Jenkinsfile needs for pwcloud platform builds (#1087)

Make sure the log file names match what Jenkinsfile needs, specifically for PW cloud platforms - Azure, AWS, GCP
---
 .cicd/scripts/srw_build.sh | 2 +-
 .cicd/scripts/srw_test.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cicd/scripts/srw_build.sh b/.cicd/scripts/srw_build.sh
index 4733c4a4ca..25546561eb 100755
--- a/.cicd/scripts/srw_build.sh
+++ b/.cicd/scripts/srw_build.sh
@@ -36,6 +36,6 @@ cd -
 # Create combined log file for upload to s3
 build_dir="${workspace}/build_${SRW_COMPILER}"
 cat ${build_dir}/log.cmake ${build_dir}/log.make \
-    >${build_dir}/srw_build-${platform}-${SRW_COMPILER}.txt
+    >${build_dir}/srw_build-${SRW_PLATFORM}-${SRW_COMPILER}.txt
 
 exit $build_exit
diff --git a/.cicd/scripts/srw_test.sh b/.cicd/scripts/srw_test.sh
index 8ed4756987..90273f2730 100755
--- a/.cicd/scripts/srw_test.sh
+++ b/.cicd/scripts/srw_test.sh
@@ -45,7 +45,7 @@ fi
 
 cd ${we2e_test_dir}
 # Progress file
-progress_file="${workspace}/we2e_test_results-${platform}-${SRW_COMPILER}.txt"
+progress_file="${workspace}/we2e_test_results-${SRW_PLATFORM}-${SRW_COMPILER}.txt"
 /usr/bin/time -p -f '{\n  "cpu": "%P"\n, "memMax": "%M"\n, "mem": {"text": "%X", "data": "%D", "swaps": "%W", "context": "%c", "waits": "%w"}\n, "pagefaults": {"major": "%F", "minor": "%R"}\n, "filesystem": {"inputs": "%I", "outputs": "%O"}\n, "time": {"real": "%e", "user": "%U", "sys": "%S"}\n}' -o ${WORKSPACE}/${SRW_PLATFORM}-${SRW_COMPILER}-time-srw_test.json \
     ./setup_WE2E_tests.sh ${platform} ${SRW_PROJECT} ${SRW_COMPILER} ${test_type} \
     --expt_basedir=${we2e_experiment_base_dir} | tee ${progress_file}; \

From 4c2cedea792b6f37ac22923d7f8d2844ea0ba7c3 Mon Sep 17 00:00:00 2001
From: Michael Lueken <63728921+MichaelLueken@users.noreply.github.com>
Date: Wed, 5 Jun 2024 08:54:55 -0400
Subject: [PATCH 2/2] [develop] Update WM hash to 1c6b4d4 (May 16) and UPP hash
 to be0410e (April 23) (#1086)

* Updated the UFS-WM hash to 1c6b4d4 (May 16) and the UPP hash to be0410e (April 23).
* Increased walltime from 01:00:00 to 02:30:00 for the custom_ESGgrid_SF_1p1km WE2E test to allow it to properly run on Hera using executables built with GNU compilers.
---
 Externals.cfg                                                 | 4 ++--
 .../custom_grids/config.custom_ESGgrid_SF_1p1km.yaml          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 6a05d66e94..9b2b544ffd 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 = 26cb9e6
+hash = 1c6b4d4
 local_path = sorc/ufs-weather-model
 required = True
 
@@ -21,7 +21,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/UPP
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 5faac75
+hash = be0410e
 local_path = sorc/UPP
 required = True
 
diff --git a/tests/WE2E/test_configs/custom_grids/config.custom_ESGgrid_SF_1p1km.yaml b/tests/WE2E/test_configs/custom_grids/config.custom_ESGgrid_SF_1p1km.yaml
index 6d9e2e0d6d..867b4675a0 100644
--- a/tests/WE2E/test_configs/custom_grids/config.custom_ESGgrid_SF_1p1km.yaml
+++ b/tests/WE2E/test_configs/custom_grids/config.custom_ESGgrid_SF_1p1km.yaml
@@ -57,7 +57,7 @@ rocoto:
   tasks:
     metatask_run_ensemble:
       task_run_fcst_mem#mem#:
-        walltime: 01:00:00
+        walltime: 02:30:00
       task_make_ics_mem#mem#:
         nnodes: 16
         ppn: 12