From 940d2f11276323cee82017b721c4fe24bd298894 Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Wed, 20 Nov 2024 10:06:41 -0700
Subject: [PATCH] modify to shorten test list and debug more quickly

---
 .github/workflows/{reusable.yaml => build.yaml} | 9 +++++----
 .github/workflows/derecho.yaml                  | 6 +++---
 cime_config/testlist_allactive.xml              | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename .github/workflows/{reusable.yaml => build.yaml} (80%)

diff --git a/.github/workflows/reusable.yaml b/.github/workflows/build.yaml
similarity index 80%
rename from .github/workflows/reusable.yaml
rename to .github/workflows/build.yaml
index 563582f0d..97d63ac0b 100644
--- a/.github/workflows/reusable.yaml
+++ b/.github/workflows/build.yaml
@@ -24,12 +24,13 @@ jobs:
           cd cime/scripts
           module load cmake
           qcmd -q main -v PROJECT=P93300606 -A P93300606 -l walltime=02:00:00 -- ./create_test --xml-machine derecho\
-              --xml-category github --no-run --compiler ${{ inputs.compiler }} --test-id ${GITHUB_RUN_ID}${{ inputs.compiler }}
+              --xml-category github2 --no-run --compiler ${{ inputs.compiler }} --test-id ${GITHUB_RUN_ID}${{ inputs.compiler }}
       - name: check status
         run: |
           cd $SCRATCH
           ./cs.status.${GITHUB_RUN_ID}${{ inputs.compiler }} --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml --fails-only | grep FAIL | grep -v FAILURE
-          if [ $? == 0 ]; then
-            return -1
+	  retval=$?
+	  if [ $retval -eq 0 ]; then
+	    echo "Error"
           fi
-          return 0
\ No newline at end of file
+	  exit 0
\ No newline at end of file
diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml
index d8b4e5c4e..2c29d2863 100644
--- a/.github/workflows/derecho.yaml
+++ b/.github/workflows/derecho.yaml
@@ -25,10 +25,10 @@ jobs:
         module list
         ./bin/git-fleximod update
 
-  reusable:
+  build:
     strategy:
       matrix:
-        compiler: [intel, intel-oneapi, nvhpc, gnu ]
-    uses: ./.github/workflows/reusable.yaml
+        compiler: [gnu ]
+    uses: ./.github/workflows/build.yaml
     with:
       compiler: ${{ matrix.compiler }}
diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
index 750cd9bf8..d747294cd 100644
--- a/cime_config/testlist_allactive.xml
+++ b/cime_config/testlist_allactive.xml
@@ -53,7 +53,7 @@
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
       <machine name="derecho" compiler="gnu" category="prealpha"/>
-      <machine name="derecho" compiler="intel" category="github"/>
+      <machine name="derecho" compiler="intel" category="github2"/>
     </machines>
     <options>
       <option name="wallclock"> 00:30:00 </option>