From 836391cf67b81f7d4d05bd96cb2682235a8eb315 Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Mon, 8 Jan 2024 06:58:54 -0600
Subject: [PATCH] Disable gsi-mon, gdas builds, enable cycled CI on hercules.
 #1588

---
 ci/cases/pr/C96C48_hybatmDA.yaml |  3 ---
 ci/cases/pr/C96_atm3DVar.yaml    |  3 ---
 sorc/build_all.sh                | 21 ++++++++++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ci/cases/pr/C96C48_hybatmDA.yaml b/ci/cases/pr/C96C48_hybatmDA.yaml
index 1f3e973ae7..c3aa6e8892 100644
--- a/ci/cases/pr/C96C48_hybatmDA.yaml
+++ b/ci/cases/pr/C96C48_hybatmDA.yaml
@@ -16,6 +16,3 @@ arguments:
   gfs_cyc: 1
   start: cold
   yaml: {{ HOMEgfs }}/ci/platforms/gfs_defaults_ci.yaml
-
-skip_ci_on_hosts:
-  - hercules
diff --git a/ci/cases/pr/C96_atm3DVar.yaml b/ci/cases/pr/C96_atm3DVar.yaml
index 360e81e9d7..5215cb0d90 100644
--- a/ci/cases/pr/C96_atm3DVar.yaml
+++ b/ci/cases/pr/C96_atm3DVar.yaml
@@ -15,6 +15,3 @@ arguments:
   gfs_cyc: 1
   start: cold
   yaml: {{ HOMEgfs }}/ci/platforms/gfs_defaults_ci.yaml
-
-skip_ci_on_hosts:
-  - hercules
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index ccc088acd9..23cf420f1d 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -129,20 +129,27 @@ build_opts["ww3prepost"]="${_verbose_opt} ${_build_ufs_opt}"
 
 # Optional DA builds
 if [[ "${_build_ufsda}" == "YES" ]]; then
-   build_jobs["gdas"]=8
-   big_jobs=$((big_jobs+1))
-   build_opts["gdas"]="${_verbose_opt}"
+   if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" ]]; then
+      echo "NOTE: The GDAS App is not supported on ${MACHINE_ID}.  Disabling build."
+   else
+      build_jobs["gdas"]=8
+      big_jobs=$((big_jobs+1))
+      build_opts["gdas"]="${_verbose_opt}"
+   fi
 fi
 if [[ "${_build_gsi}" == "YES" ]]; then
    build_jobs["gsi_enkf"]=8
-   big_jobs=$((big_jobs+1))
    build_opts["gsi_enkf"]="${_verbose_opt}"
 fi
 if [[ "${_build_gsi}" == "YES" || "${_build_ufsda}" == "YES" ]] ; then
    build_jobs["gsi_utils"]=2
    build_opts["gsi_utils"]="${_verbose_opt}"
-   build_jobs["gsi_monitor"]=1
-   build_opts["gsi_monitor"]="${_verbose_opt}"
+   if [[ "${MACHINE_ID}" == "hercules" ]]; then
+      echo "NOTE: The GSI Monitor is not supported on Hercules.  Disabling build."
+   else
+      build_jobs["gsi_monitor"]=1
+      build_opts["gsi_monitor"]="${_verbose_opt}"
+   fi
 fi
 
 # Go through all builds and adjust CPU counts down if necessary
@@ -168,7 +175,7 @@ if [[ ${requested_cpus} -lt ${_build_job_max} && ${big_jobs} -gt 0 ]]; then
    extra_cores=$(( _build_job_max - requested_cpus ))
    extra_cores=$(( extra_cores / big_jobs ))
    for build in "${!build_jobs[@]}"; do
-      if [[ "${build}" == "gdas" || "${build}" == "ufs" || "${build}" == "gsi_enkf" ]]; then
+      if [[ "${build}" == "gdas" || "${build}" == "ufs" ]]; then
          build_jobs[${build}]=$(( build_jobs[${build}] + extra_cores ))
       fi
    done