diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml index f7d2abbcc..2054d9d60 100644 --- a/.github/workflows/derecho.yaml +++ b/.github/workflows/derecho.yaml @@ -7,12 +7,25 @@ on: types: [ labeled ] jobs: - build: + 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: + needs: [setup] strategy: matrix: - compiler: [intel, intel-oneapi, gnu, nvhpc] +# compiler: [intel, intel-oneapi, gnu, nvhpc] + compiler: [intel, intel-oneapi] env: CC: mpicc FC: mpifort @@ -21,18 +34,8 @@ jobs: CIME_DRIVER: nuopc GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Run git-fleximod - run: | - pwd - module list - ./bin/git-fleximod update - - name: Run ${{ matrix.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 ${{ matrix.compiler }} + uses ESCOMP/CESM/.github/workflows/reusable.yaml@mail + with: + stage: ${{ matrix.compiler }} + + diff --git a/.github/workflows/reusable.yaml b/.github/workflows/reusable.yaml new file mode 100644 index 000000000..4e151d609 --- /dev/null +++ b/.github/workflows/reusable.yaml @@ -0,0 +1,21 @@ +on: + workflow_call: + inputs: + compiler: + required: true + type: string +jobs: + test: + runs-on: hpc-runner + steps: + - 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 ${{ matrix.compiler }} --test-id ghtest.${{ inputs.compiler }} + - name: check status + run: | + cd $SCRATCH + ./cs.status.ghtest.${{ inputs.compiler }} --expected-fails-file ghtest.expected_fails.${{ inputs.compiler }} \ No newline at end of file diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index 3985b28be..750cd9bf8 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -104,7 +104,7 @@ - +