Use master

Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
daos-stack · Dec 10, 2024 · d41bd10 · d41bd10
1 parent 8305d34
commit d41bd10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/rpm-test.yml b/.github/workflows/rpm-test.yml
@@ -34,10 +34,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # no GHA support on this branch: branch: [master, release/2.4]
-        # DO NOT LAND - using PR as master for now
-        # branch: [master]
-        branch: [bmurrell/gha-refactor]
+        # ideally we want to test on both master and release/* but there is no
+        # GHA support on the release/2.6 branch yet
+        # branch: [master, release/2.6]
+        branch: [master]
     env:
       PR_REPO: >-
         ${{ inputs.NAME }}@PR-${{ github.event.pull_request.number }}:${{ github.run_number }}
@@ -58,14 +58,11 @@ jobs:
           # TODO: rpm-test-version of course needs to either be the latest
           #       version, or better yet, no version and it installs the latest
           #       version
-          client_payload: '{"pr-repos":
-                              "${{ env.PR_REPO }}",
-                            "commit-message":
-                              "Override commit pragmas",
-                            "test-tag":
-                              "load_mpi test_core_files ${{ inputs.TEST_TAG }}",
-                            "functional-test-distros":
-                              "${{ inputs.DISTROS }}"
+          client_payload: '{"pr-repos": "${{ env.PR_REPO }}",
+                            "commit-message": "Override commit pragmas",
+                            "test-tag": "load_mpi test_core_files ${{ inputs.TEST_TAG }}",
+                            "functional-test-distros": "${{ inputs.DISTROS }}",
+                            "run-gha": "${{ inputs.RUN_GHA }}"
                            }'
           propagate_failure: true
       # TODO: investigate how cancelling this can cancel the downstream job

diff --git a/.github/workflows/test-rpm-build.yml b/.github/workflows/test-rpm-build.yml
@@ -72,5 +72,5 @@ jobs:
       UPDATE_PACKAGING: true
       PACKAGING_DIR: ${{ matrix.repo == 'daos' && 'utils/rpms' ||
                          needs.Variables.outputs.PACKAGING_DIR }}
-      BRANCH:  ${{ matrix.repo == 'daos' && 'bmurrell/gha-refactor' || 'master' }}
+      BRANCH:  master
       RUN_GHA: true