Back to using the matrix

Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Nov 24, 2022 · 6d0047f · 6d0047f
1 parent c5f005e
commit 6d0047f
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/.github/workflows/rpm-build-and-test.yaml b/.github/workflows/rpm-build-and-test.yaml
@@ -152,16 +152,15 @@ jobs:
     name: Test RPMs on EL 8
     runs-on: [self-hosted, mockbuilder]
     needs: [Build-EL8-RPM]
-    # needs: [Import-commit-message, Import-commit-pragmas, Import-commit-pragmas2]
-    # strategy:
-    #   fail-fast: false
-    #   matrix:
-    #     branch: [master, release/2.2]
-    #     include:
-    #       - branch: master
-    #         use_branch: bmurrell/gha-self-hosted-runner
-    #       - branch: release/2.2
-    #         use_branch: bmurrell/gha-self-hosted-runner-2.2
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: [master, release/2.2]
+        include:
+          - branch: master
+            use_branch: bmurrell/gha-self-hosted-runner
+          - branch: release/2.2
+            use_branch: bmurrell/gha-self-hosted-runner-2.2
     steps:
       - name: Test RPMs with DAOS
         uses: convictional/[email protected]
@@ -171,8 +170,8 @@ jobs:
           github_token: ${{ secrets.GHA_WORKFLOW_TRIGGER }}
           comment_downstream_url: ${{ github.event.pull_request.comments_url }}
           workflow_file_name: 'rpm-build-and-test.yml'
-          # ref: ${{ matrix.use_branch }}
-          ref: bmurrell/gha-self-hosted-runner-2.2
+          ref: ${{ matrix.use_branch }}
+          # ref: bmurrell/gha-self-hosted-runner-2.2
           wait_interval: 10
           client_payload: '{"pr-repos": "argobots@PR-${{ github.event.pull_request.number }}"}'
           propagate_failure: true