Main to dev (2024-04-05)

.github/actions/testing-setup/action.yml

@@ -28,7 +28,7 @@ runs:
       run: |
         echo "::group::Compile FMS library"
         cd .testing
-        REPORT_ERROR_LOGS=true make deps/lib/libFMS.a -s -j
+        REPORT_ERROR_LOGS=true make build/deps/lib/libFMS.a -s -j
         echo "::endgroup::"
 
     - name: Compile MOM6 in symmetric memory mode

.github/workflows/perfmon.yml

@@ -40,14 +40,36 @@ jobs:
         sudo sysctl -w kernel.perf_event_paranoid=2
         make perf DO_REGRESSION_TESTS=true
 
+    # This job assumes that build/target_codebase was cloned above
+    - name: Compile timing tests for reference code
+      if: ${{ github.event_name == 'pull_request' }}
+      run: >-
+        make -j build.timing_target
+        MOM_TARGET_SLUG=$GITHUB_REPOSITORY
+        MOM_TARGET_LOCAL_BRANCH=$GITHUB_BASE_REF
+        DO_REGRESSION_TESTS=true
+
     - name: Compile timing tests
       run: |
         make -j build.timing
 
+    # DO_REGERESSION_TESTS=true is needed here to set the internal macro TARGET_CODEBASE
+    - name: Run timing tests for reference code
+      if: ${{ github.event_name == 'pull_request' }}
+      run: >-
+        make -j run.timing_target
+        DO_REGRESSION_TESTS=true
+
     - name: Run timing tests
       run: |
         make -j run.timing
 
     - name: Display timing results
       run: |
         make -j show.timing
+
+    - name: Display comparison of timing results
+      if: ${{ github.event_name == 'pull_request' }}
+      run: >-
+        make -j compare.timing
+        DO_REGRESSION_TESTS=true

.gitlab-ci.yml

@@ -9,7 +9,7 @@ stages:
 # that is unique to this pipeline.
 # We use the "fetch" strategy to speed up the startup of stages
 variables:
-  JOB_DIR: "/lustre/f2/scratch/oar.gfdl.ogrp-account/runner/builds/$CI_PIPELINE_ID"
+  JOB_DIR: "/gpfs/f5/gfdl_o/scratch/oar.gfdl.ogrp-account/runner/builds/$CI_PIPELINE_ID"
   GIT_STRATEGY: fetch
 
 # Always eport value of $JOB_DIR