Merge branch 'develop' into feature/ens-WCDA-ctest

NOAA-EMC · Oct 16, 2024 · ddc5445 · ddc5445
2 parents dcd4322 + e1fcce1
commit ddc5445
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/ci_unit_tests.yaml b/.github/workflows/ci_unit_tests.yaml
@@ -4,8 +4,8 @@ on: [pull_request, push, workflow_dispatch]
 jobs:
 
   ci_pytest:
-      runs-on: ubuntu-latest
-      name: Run unit tests on CI system      
+      runs-on: ubuntu-22.04
+      name: Run unit tests on CI system
       permissions:
         checks: write
 

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -21,7 +21,7 @@ jobs:
     permissions:
       pull-requests: 'write'
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build and deploy documentation
 
     steps:

diff --git a/.github/workflows/hera.yaml b/.github/workflows/hera.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
 
   getlabels:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       labels: ${{ steps.id.outputs.labels }}
     steps:

diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -12,7 +12,7 @@ defaults:
 
 jobs:
   lint-shell:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     permissions:
       security-events: write

diff --git a/.github/workflows/orion.yaml b/.github/workflows/orion.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
 
   getlabels:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       labels: ${{ steps.id.outputs.labels }}
     steps:
@@ -27,7 +27,7 @@ jobs:
 
   passed:
     if: contains( needs.getlabels.outputs.labels, 'CI-Orion-Passed') && github.event.pull_request.merged
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs:
      - getlabels
 

diff --git a/.github/workflows/pynorms.yaml b/.github/workflows/pynorms.yaml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   check_norms:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Check Python coding norms with pycodestyle
 
     steps:

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -1214,12 +1214,10 @@ case ${step} in
       "C768")
         tasks_per_node=21
         threads_per_task=6
-        memory="23GB"
         ;;
       "C1152")
         tasks_per_node=9
         threads_per_task=14
-        memory="50GB"
         ;;
       *)
         tasks_per_node=21