apparently need to check out the code each time

ESCOMP · Nov 18, 2024 · 8581e40 · 8581e40
1 parent db7711e
commit 8581e40
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 19 deletions.
diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml
@@ -7,19 +7,6 @@ on:
     types: [ labeled ]
 
 jobs:
-  setup:
-    if: ${{ github.event.label.name == 'run-pr-tests' }}
-    runs-on: hpc-runner
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Run git-fleximod
-      run: |
-        pwd
-        module list
-        ./bin/git-fleximod update
-
   reusable:
     runs-on: hpc-runner
     strategy:

diff --git a/.github/workflows/reusable.yaml b/.github/workflows/reusable.yaml
@@ -9,15 +9,22 @@ jobs:
   test:
     runs-on: hpc-runner
     steps:
-      - name: Run ${{ inputs.compiler }} tests
-        continue-on-error: true
-        run: |
+    - name: Checkout code
+      uses: actions/checkout@v4
+    - name: Run git-fleximod
+      run: |
+        pwd
+        module list
+        ./bin/git-fleximod update
+    - name: Run ${{ inputs.compiler }} tests
+      continue-on-error: true
+      run: |
           pwd
           cd cime/scripts
           module load cmake
           qcmd -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 ghtest.${{ inputs.compiler }}
-      - name: check status
-        run: |
+    - name: check status
+      run: |
           cd $SCRATCH
-          ./cs.status.ghtest.${{ inputs.compiler }} --expected-fails-file $HOME/ghtest.expected_fails.${{ inputs.compiler }} 
+          ./cs.status.ghtest.${{ inputs.compiler }} --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml
diff --git a/cime_config/testfiles/ExpectedTestFails.xml b/cime_config/testfiles/ExpectedTestFails.xml
@@ -0,0 +1,48 @@
+<?xml version= "1.0"?>
+
+<expectedFails version="1.1">
+
+  <!-- Notes about the format of this file:
+
+       The required elements for a given failure are just:
+
+         <test name="...">
+           <phase name="...">
+             <status>...</status>
+           </phase>
+         </test>
+
+       There can be multiple phase blocks in a given test block.
+
+       In addition, a number of optional elements are allowed, which
+       currently are just for human consumption (not parsed by any
+       scripts):
+
+       - A phase block can contain an "issue" element, which gives the
+       issue number associated with this failure. (#123 refers to issue
+       #123 in the ESCOMP/ctsm repository. Issues in other repositories
+       should be specified as ORG/repo#123 - e.g., ESMCI/cime#123.)
+
+       - A phase block can contain a "comment" element, which gives any
+       sort of comment you desire.
+  -->
+
+
+<!--
+  <test name="SMS_Ld12_Mmpi-serial.1x1_urbanc_alpha.I1PtClm60SpRs.derecho_intel.clm-output_sp_highfreq--clm-nofireemis">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>CDEPS/#243</issue>
+    </phase>
+  </test>
+
+  <test name="SMS_D.1x1_brazil.I1850Clm60BgcCrop.derecho_gnu.clm-mimics_matrixcn">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#2780</issue>
+      <comment>Crashes in the matrix solver.</comment>
+    </phase>
+  </test>
+-->
+
+</expectedFails>