add check imagestreams as composite action (#291)

sclorg · Mar 26, 2024 · 5e9d6c1 · 5e9d6c1
1 parent deab1dd
commit 5e9d6c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 60 deletions.
diff --git a/.github/workflows/check-imagestreams.yml b/.github/workflows/check-imagestreams.yml
diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml
@@ -4,10 +4,25 @@ on:
       - created
 
 jobs:
+  check-imagestreams:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      statuses: write
+    if: |
+      github.event.issue.pull_request
+      && (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
+      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
+    steps:
+      - uses: sclorg/ci-scripts/ocp-stream-generator@master
+        with:
+          ref: "refs/pull/${{ github.event.issue.number }}/head"
+
   openshift-tests:
     name: "${{ matrix.test_case }} tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     concurrency:
+    needs: check-imagestreams
       group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
       cancel-in-progress: true
     strategy:
@@ -16,11 +31,6 @@ jobs:
         version: [ "1.20", "1.22", "1.22-micro", "1.24" ]
         os_test: [ "rhel7", "rhel8", "rhel9" ]
         test_case: [ "openshift-4" ]
-
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
     steps:
       - uses: sclorg/tfaga-wrapper@main
         with: