From 8f1c4e4bb9202a90b6d86fe8763275fd86b82e73 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Mon, 7 Oct 2024 21:55:36 -0400
Subject: [PATCH] Release 1.8.0 additional fixes for Jet, Hercules and Orion
 (after running ufs-weather-model) (#1331)

* Update Jet packages_intel.yaml
* Update Orion packages_intel.yaml
* Update Orion packages_gcc.yaml
* Update Hercules packages.yaml
---
 configs/sites/tier1/hercules/packages.yaml    | 12 ++++++++++++
 configs/sites/tier1/jet/packages_intel.yaml   |  2 ++
 configs/sites/tier1/orion/packages_gcc.yaml   |  2 --
 configs/sites/tier1/orion/packages_intel.yaml |  2 --
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml
index 0128505f1..bb6e6222c 100644
--- a/configs/sites/tier1/hercules/packages.yaml
+++ b/configs/sites/tier1/hercules/packages.yaml
@@ -15,6 +15,10 @@ packages:
     externals:
     - spec: coreutils@8.32
       prefix: /usr
+  curl:
+    externals:
+    - spec: curl@7.76.1+gssapi+ldap+nghttp2
+      prefix: /usr
   diffutils:
     externals:
     - spec: diffutils@3.7
@@ -60,6 +64,14 @@ packages:
       prefix: /work/noaa/epic/role-epic/spack-stack/hercules/mysql-8.0.31
       modules:
       - mysql/8.0.31
+  openssh:
+    externals:
+    - spec: openssh@8.7p1
+      prefix: /usr
+  openssl:
+    externals:
+    - spec: openssl@3.0.1
+      prefix: /usr
   pkgconf:
     externals:
     - spec: pkgconf@1.7.3
diff --git a/configs/sites/tier1/jet/packages_intel.yaml b/configs/sites/tier1/jet/packages_intel.yaml
index cc0cac045..5e0b82aaf 100644
--- a/configs/sites/tier1/jet/packages_intel.yaml
+++ b/configs/sites/tier1/jet/packages_intel.yaml
@@ -8,6 +8,8 @@ packages:
   intel-oneapi-mpi:
     externals:
     - spec: intel-oneapi-mpi@2021.5.1%intel@2021.5.0
+      modules:
+      - impi/2022.1.2
       prefix: /apps/oneapi
   intel-oneapi-mkl:
     externals:
diff --git a/configs/sites/tier1/orion/packages_gcc.yaml b/configs/sites/tier1/orion/packages_gcc.yaml
index 8a8f8d641..aadfeb18c 100644
--- a/configs/sites/tier1/orion/packages_gcc.yaml
+++ b/configs/sites/tier1/orion/packages_gcc.yaml
@@ -3,8 +3,6 @@ packages:
     compiler:: [gcc@12.2.0]
     providers:
       mpi:: [openmpi@4.1.4]
-      # https://github.com/JCSDA/spack-stack/issues/1055
-      zlib-api:: [zlib]
   mpi:
     buildable: False
   openmpi:
diff --git a/configs/sites/tier1/orion/packages_intel.yaml b/configs/sites/tier1/orion/packages_intel.yaml
index 8c1e33385..eb4a22dc7 100644
--- a/configs/sites/tier1/orion/packages_intel.yaml
+++ b/configs/sites/tier1/orion/packages_intel.yaml
@@ -3,8 +3,6 @@ packages:
     compiler:: [intel@2021.9.0,gcc@12.2.0]
     providers:
       mpi:: [intel-oneapi-mpi@2021.9.0]
-      # https://github.com/JCSDA/spack-stack/issues/1055
-      zlib-api:: [zlib]
       # Remove the next three lines to switch to intel-oneapi-mkl
       blas:: [openblas]
       fftw-api:: [fftw]