Upgrade to spack-stack 1.9.2

.gitignore

@@ -98,6 +98,7 @@ parm/regrid_sfc
 #--------------------------------------------
 sorc/build.xml
 sorc/build.db
+sorc/build.db-journal
 sorc/build_lock.db
 sorc/rocotostat.out
 sorc/*log
@@ -173,6 +174,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 log file
 ush/fetch-fix-data.log
 

dev/ci/Jenkinsfile

@@ -6,9 +6,9 @@ def HOMEgfs_dev = 'none'
 def CI_CASES = ''
 def GH = 'none'
 // Map of the machine names (MACHINE_ID) to the Jenkins Node names
-def NodeName = [hera: 'Hera-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaeac5: 'GaeaC5', gaeac6: 'Gaeac6-EMC']
+def NodeName = [hera: 'Hera-EMC', ursa: 'Ursa-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaeac5: 'GaeaC5', gaeac6: 'Gaeac6-EMC']
 // Location of the custom workspaces for each machine in the CI system.  They are persistent for each iteration of the PR.
-def custom_workspace = [hera: '/scratch3/NCEPDEV/global/glopara/CI/HERA', orion: '/work2/noaa/global/role-global/GFS_CI_CD/ORION/CI', hercules: '/work2/noaa/global/role-global/GFS_CI_CD/HERCULES/CI', gaeac5: '/gpfs/f5/epic/proj-shared/global/CI', gaeac6: '/gpfs/f6/drsa-precip3/world-shared/global/CI']
+def custom_workspace = [hera: '/scratch3/NCEPDEV/global/role.glopara/CI/HERA', ursa: '/scratch3/NCEPDEV/global/role.glopara/CI/URSA', orion: '/work2/noaa/global/role-global/GFS_CI_CD/ORION/CI', hercules: '/work2/noaa/global/role-global/GFS_CI_CD/HERCULES/CI', gaeac5: '/gpfs/f5/epic/proj-shared/global/CI', gaeac6: '/gpfs/f6/drsa-precip3/world-shared/global/CI']
 def repo_url = 'git@github.com:NOAA-EMC/global-workflow.git'
 
 def STATUS = 'Passed'
@@ -87,7 +87,7 @@ pipeline {
                     Machine = machine[0].toUpperCase() + machine.substring(1)
                     echo "Getting Common Workspace for ${Machine}"
                     ws("${custom_workspace[machine]}/${env.CHANGE_ID}") {
-                        properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'hercules-emc', 'hera-emc', 'orion-emc', 'gaeaC5', 'gaeaC6-emc'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
+                        properties([parameters([[$class: 'NodeParameterDefinition', allowedSlaves: ['built-in', 'hercules-emc', 'hera-emc', 'ursa-emc', 'orion-emc', 'gaeaC5', 'gaeaC6-emc'], defaultSlaves: ['built-in'], name: '', nodeEligibility: [$class: 'AllNodeEligibility'], triggerIfResult: 'allCases']])])
                         GH = sh(script: "which gh || echo '~/bin/gh'", returnStdout: true).trim()
                         CUSTOM_WORKSPACE = "${WORKSPACE}"
                         HOMEgfs = "${CUSTOM_WORKSPACE}/global-workflow"

dev/ci/cases/gcafsv1/C96_gcafs_cycled.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122100
   nens: 0

dev/ci/cases/gcafsv1/C96_gcafs_cycled_noDA.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122100
   nens: 0

dev/ci/cases/gcafsv1/C96_gcafs_cycled_noDA_dev.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122200
   nens: 0

dev/ci/cases/pr/C48mx500_3DVarAOWCDA.yaml

@@ -9,7 +9,7 @@ arguments:
   resdetocean: 5.0
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250808
   idate: 2021032418
   edate: 2021032500
   nens: 0

dev/ci/cases/pr/C48mx500_hybAOWCDA.yaml

@@ -10,7 +10,7 @@ arguments:
   resdetocean: 5.0
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250808
   idate: 2021032418
   edate: 2021032500
   nens: 2

dev/ci/cases/pr/C96C48_hybatmDA.yaml

@@ -10,7 +10,7 @@ arguments:
   resensatmos: 48
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122018
   edate: 2021122106
   nens: 2

dev/ci/cases/pr/C96C48_hybatmsnowDA.yaml

@@ -9,7 +9,7 @@ arguments:
   resensatmos: 48
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122100
   nens: 2

dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml

@@ -9,7 +9,7 @@ arguments:
   resensatmos: 48
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2024022318
   edate: 2024022406
   nens: 2

dev/ci/cases/pr/C96C48mx500_S2SW_cyc_gfs.yaml

@@ -10,7 +10,7 @@ arguments:
   resdetocean: 5.0
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122100
   nens: 2

dev/ci/cases/pr/C96_atm3DVar.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122018
   edate: 2021122106
   nens: 0

dev/ci/cases/pr/C96_atm3DVar_extended.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122018
   edate: 2021122118
   nens: 0

dev/ci/cases/pr/C96_gcafs_cycled.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122100
   nens: 0

dev/ci/cases/pr/C96_gcafs_cycled_noDA.yaml

@@ -8,7 +8,7 @@ arguments:
   resdetatmos: 96
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
-  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
+  icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250808
   idate: 2021122012
   edate: 2021122100
   nens: 0

dev/ci/platforms/config.ursa

@@ -0,0 +1,67 @@
+#!/usr/bin/bash
+
+#########################################################################
+# config.ursa - Platform-specific configuration for Ursa
+#
+# This file contains environment variables used by CI/CD scripts,
+# directories, and settings specific to the Ursa platform.
+#########################################################################
+
+# Main CI root directory - Base directory for all CI/CD operations
+export GFS_CI_ROOT=/scratch3/NCEPDEV/global/role.glopara/GFS_CI_CD
+
+# ICSDIR root directory - Contains initial condition data
+# Used by create_experiment.py for setting up test cases
+export ICSDIR_ROOT=/scratch3/NCEPDEV/global/role.glopara/data/ICSDIR
+
+
+#########################################################################
+# Jenkins configuration settings
+#########################################################################
+
+# JENKINS launch directory for agent - Where Jenkins agents are launched from
+export JENKINS_AGENT_LAUNCH_DIR=${GFS_CI_ROOT}/Jenkins/agent
+
+# JENKINS internal working directories for CI jobs (not for users use)
+# Where Jenkins stores temporary files during CI job execution
+export JENKINS_WORK_DIR=${GFS_CI_ROOT}/Jenkins/workspace
+
+# NOTE: JENKINS custom_workspace directory where CI jobs are run
+# and is defined in $HOMEgfs/dev/ci/Jenkinsfile as custom_workspace
+# /scratch3/NCEPDEV/global/role.glopara/CI
+
+
+#########################################################################
+# GitLab CI configuration
+# These variables are referenced directly by launch_gitlab_runner.sh
+#########################################################################
+
+# Used in the 'register' step of launch_gitlab_runner.sh for --url parameter
+export GITLAB_URL=https://vlab.noaa.gov/gitlab-licensed
+export GITLAB_RUNNER_NAME="RDHPCS Ursa"
+
+# Directory for GitLab builds
+# Used in launch_gitlab_runner.sh for the --builds-dir parameter
+# This works with --custom_build_dir-enabled=true to allow GIT_CLONE_PATH override
+# from .gitlab-ci.yml to specify exact clone locations within this directory
+export GITLAB_BUILDS_DIR=${GFS_CI_ROOT}/BUILDS/GITLAB
+
+# Directory for GitLab runner used by launch_gitlab_runner.sh
+# This is where runner state/config files are stored (--working-directory parameter)
+export GITLAB_RUNNER_DIR="${GFS_CI_ROOT}/GitLab/Runner"
+
+#########################################################################
+# CTest functional test directories for pre stagged input data
+#########################################################################
+export STAGED_CTESTS=${GITLAB_BUILDS_DIR}/stable/RUNTESTS
+
+
+#########################################################################
+# CI CRON system configuration
+#########################################################################
+export GW_BASH_CI_ROOT=${GFS_CI_ROOT}/GFS_BASH_CI
+export max_concurrent_cases=5
+export max_concurrent_pr=4
+
+# HPC account which overides the default account
+export HPC_ACCOUNT=fv3-cpu

dev/ci/scripts/driver_weekly.sh

@@ -54,7 +54,7 @@ esac
 set +x
 source "${ROOT_DIR}/ush/module-setup.sh"
 module use "${ROOT_DIR}/modulefiles"
-module load "module_gwsetup.${MACHINE_ID}"
+module load "gw_setup.${MACHINE_ID}"
 set -x
 
 #########################################################

dev/ci/scripts/utils/ci_utils.sh

@@ -126,7 +126,7 @@ function create_experiment () {
   local TAG="${2:-${pr_sha}}"
   cd "${HOMEgfs_}" || exit 1
   case=$(basename "${yaml_config}" .yaml) || true
-  
+
   echo "Using provided TAG: ${TAG} for pslot"
   export pslot=${case}_${TAG}
 
@@ -201,12 +201,11 @@ function cleanup_experiment() {
 function build () {
 
   source "${HOMEgfs_}/dev/ci/platforms/config.${MACHINE_ID}"
-  # TODO: when it's safe to build on C6 compute nodes again, do so
-  if [[ "${MACHINE_ID}" == "gaeac6" ]]; then
-    "${HOMEgfs_}/sorc/build_all.sh" -k all
-  else
-    "${HOMEgfs_}/sorc/build_compute.sh" -A "${HPC_ACCOUNT}" all
-  fi
+  # TODO: when it is safe to build the GDASApp on the compute nodes again, do so (issues #3933 and #3932)
+  "${HOMEgfs_}/sorc/build_gdas.sh" &  # Run in the background while the compute build is running
+  "${HOMEgfs_}/sorc/build_compute.sh" -A "${HPC_ACCOUNT}" gfs gcafs gefs sfs gsi
+  # Wait for the GDASApp to finish building
+  wait
 
 }
 

dev/ci/scripts/utils/launch_java_agent.sh

@@ -89,7 +89,7 @@ rm -f "${LOG}"
 
 HOMEgfs="${HOMEgfs_}" source "${HOMEgfs_}/ush/module-setup.sh"
 module use "${HOMEgfs_}/modulefiles"
-module load "module_gwsetup.${MACHINE_ID}"
+module load "gw_setup.${MACHINE_ID}"
 
 if [[ ${MACHINE_ID} == "noaacloud" ]]; then
   source "${HOMEgfs_}/dev/ci/platforms/config.${PW_CSP}"

dev/jobs/upp.sh

@@ -18,7 +18,7 @@ if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
   set +x
   source "${HOMEgfs}/ush/module-setup.sh"
   module use "${HOMEgfs}/sorc/ufs_model.fd/FV3/upp/modulefiles"
-  module load "${MACHINE_ID}"
+  module load "${MACHINE_ID}_intel"
   module load prod_util
   module load cray-pals
   module load cfp
@@ -44,7 +44,9 @@ if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
 else
   source "${HOMEgfs}/dev/ush/load_fv3gfs_modules.sh"
   status=$?
-  if (( status != 0 )); then exit "${status}"; fi
+  if [[ ${status} -ne 0 ]]; then
+     exit "${status}";
+  fi
 fi
 
 export job="upp"

dev/parm/config/gcafs/config.resources

@@ -47,6 +47,10 @@ case ${machine} in
               max_tasks_per_node=40
               mem_node_max="96GB"
     ;;
+  "URSA")
+              max_tasks_per_node=192
+              mem_node_max="360GB"
+    ;;
   "GAEAC5")
               max_tasks_per_node=128
               mem_node_max="251GB"

dev/parm/config/gefs/config.resources

@@ -19,6 +19,7 @@ echo "BEGIN: config.resources"
 case ${machine} in
   "WCOSS2")   max_tasks_per_node=128;;
   "HERA")     max_tasks_per_node=40;;
+  "URSA")     max_tasks_per_node=192;;
   "ORION")    max_tasks_per_node=40;;
   "HERCULES") max_tasks_per_node=80;;
   "GAEAC5")   max_tasks_per_node=128;;

dev/parm/config/gfs/config.resources

@@ -45,6 +45,10 @@ case ${machine} in
               max_tasks_per_node=40
               mem_node_max="96GB"
     ;;
+  "URSA")
+              max_tasks_per_node=192
+              mem_node_max="360GB"
+    ;;
   "GAEAC5")
               max_tasks_per_node=128
               mem_node_max="251GB"
@@ -1036,7 +1040,7 @@ case ${step} in
     ntasks=1
     threads_per_task=1
     tasks_per_node=1
-    memory="5G"
+    memory="10G"
     ;;
 
   "vminmon")