diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 0cf2e77a5..e5b52997c 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -113,7 +113,7 @@ jobs: cd $GITHUB_WORKSPACE/candidate/build/Run make run-croton-${{ matrix.configuration }} - - name: Compare HYDRO_RST.* output with xrcmp + - name: generic - Compare HYDRO_RST.* output with xrcmp if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -124,7 +124,7 @@ jobs: --log_file $file_diff.txt \ --n_cores 1; \ done - - name: Compare RESTART.* output with xrcmp + - name: generic - Compare RESTART.* output with xrcmp if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -135,7 +135,7 @@ jobs: --log_file $file_diff.txt \ --n_cores 1; \ done - - name: Compare last *.CHANOBS_DOMAIN1 output with xrcmp + - name: generic - Compare last *.CHANOBS_DOMAIN1 output with xrcmp if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -145,7 +145,7 @@ jobs: --reference $GITHUB_WORKSPACE/reference/build/Run/$file \ --log_file $file_diff.txt \ --n_cores 1; \ - - name: Compare last *.CHRTOUT_DOMAIN1 output with xrcmp + - name: generic - Compare last *.CHRTOUT_DOMAIN1 output with xrcmp if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -155,7 +155,7 @@ jobs: --reference $GITHUB_WORKSPACE/reference/build/Run/$file \ --log_file $file_diff.txt \ --n_cores 1; \ - - name: Compare last *.LSMOUT_DOMAIN1 output with xrcmp + - name: generic - Compare last *.LSMOUT_DOMAIN1 output with xrcmp if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -166,7 +166,7 @@ jobs: --log_file $file_diff.txt \ --n_cores 1; \ - - name: Compare last *.RTOUT_DOMAIN1 output with xrcmp + - name: generic - Compare last *.RTOUT_DOMAIN1 output with xrcmp if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -177,7 +177,7 @@ jobs: --log_file $file_diff.txt \ --n_cores 1; \ - - name: Compare output with compare_output + - name: generic - Compare output with compare_output if: ${{ always() }} run: | cd $GITHUB_WORKSPACE/candidate/build/Run @@ -192,20 +192,20 @@ jobs: '${GITHUB_WORKSPACE}/reference/build/Run/output_${{ matrix.configuration }}/', \ '${{ matrix.configuration }}')" - - name: Copy test results from container + - name: generic - Copy test results from container if: ${{ always() }} run: | mkdir -p $GITHUB_WORKSPACE/test_report cp -r $GITHUB_WORKSPACE/candidate/build/Run/output_diff/diff_plots/* $GITHUB_WORKSPACE/test_report/ - - name: Attach diff plots to PR + - name: generic - Attach diff plots to PR if: ${{ failure() }} shell: bash run: | cd $GITHUB_WORKSPACE/candidate/tests/local/utils - bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }} + bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }} generic - - name: Archive test results to GitHub + - name: generic - Archive test results to GitHub if: ${{ failure() }} uses: actions/upload-artifact@v4 with: @@ -313,7 +313,7 @@ jobs: shell: bash run: | cd $GITHUB_WORKSPACE/candidate/tests/local/utils - bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }} + bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }} n-cores - name: n-cores - Archive test results to GitHub if: ${{ failure() }} @@ -426,7 +426,7 @@ jobs: shell: bash run: | cd $GITHUB_WORKSPACE/candidate/tests/local/utils - bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }} + bash attach_all_plots.bash $(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") ${{ matrix.configuration }} perfect-restart - name: restart - Archive test results to GitHub if: ${{ failure() }} diff --git a/tests/local/utils/attach_all_plots.bash b/tests/local/utils/attach_all_plots.bash index 75ef57751..6f175c0fd 100644 --- a/tests/local/utils/attach_all_plots.bash +++ b/tests/local/utils/attach_all_plots.bash @@ -2,6 +2,7 @@ PR=$1 CONFIG=$2 +TEST_TYPE=$3 cwd=`pwd` diffs=$GITHUB_WORKSPACE/test_report/$CONFIG @@ -10,7 +11,7 @@ if [[ ! -d $diffs ]]; then exit 0 fi -title="Difference plots for configuration '$CONFIG'" +title="Difference plots for configuration '$CONFIG' and $TEST_TYPE test type" # set for repo authentication git config --global user.email "model.tester@ucar.edu"