update build-and-push.yml

Signed-off-by: Alyssa Goins <agoins@redhat.com>

Author: alyssacgoins

.github/workflows/add-ci-passed-label.yml

@@ -11,7 +11,7 @@ on:
       - labeled
       - unlabeled
   workflow_run:
-    workflows: ["CI Check"]
+    workflows: [ "CI Check" ]
     types:
       - completed
 
@@ -20,8 +20,12 @@ permissions:
   issues: write
 
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   fetch_data:
     name: Fetch PR eligibility
+    needs: gatekeeper
     runs-on: ubuntu-latest
     outputs:
       pr_number: ${{ steps.pr.outputs.pr_number }}
@@ -87,6 +91,7 @@ jobs:
 
   reset_ci_passed_label:
     name: Reset stale 'ci-passed' label
+    needs: gatekeeper
     runs-on: ubuntu-latest
     steps:
       - name: Remove existing 'ci-passed' label
@@ -125,7 +130,7 @@ jobs:
   add_ci_passed_label:
     name: Add 'ci-passed' label
     runs-on: ubuntu-latest
-    needs: fetch_data
+    needs: [fetch_data,gatekeeper]
     steps:
       - name: Add 'ci-passed' label
         shell: bash

.github/workflows/api-server-tests.yml

@@ -17,11 +17,6 @@ on:
       - main
       - stable
       - 'rhoai-*'
-  workflow_run:
-    id: gatekeeper
-    workflows: [ "Gatekeeper" ]
-    types:
-      - completed
 
   workflow_dispatch:
     inputs:
@@ -64,21 +59,11 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  cancel-on-gatekeeper-failure:
-    if: ${{ github.event.gatekeeper.conclusion != 'success' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cancel Workflow
-        uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.actions.cancelWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: context.runId,
-            })
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
 
   build:
+    needs: gatekeeper
     uses: ./.github/workflows/image-builds.yml
 
   api-test-standalone:
@@ -250,7 +235,6 @@ jobs:
           deployment_mode: ${{ steps.deploy.outputs.deployment_mode }}
 
   api-test-multi-user:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     needs: build
     runs-on: ubuntu-latest
     strategy:

.github/workflows/backend-visualization.yml

@@ -16,10 +16,12 @@ on:
       - '!**/*.md'
       - '!**/OWNERS'
 
-
-
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   backend-visualization-test:
+    needs: gatekeeper
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

.github/workflows/build-master.yml

@@ -6,6 +6,7 @@ on:
       - main
       - stable
       - 'rhoai-*'
+
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true

.github/workflows/build-prs-trigger.yaml

@@ -15,7 +15,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   upload-data:
+    needs: gatekeeper
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/build-prs.yml

@@ -1,7 +1,7 @@
 name: Build images for PRs
 on:
   workflow_run:
-    workflows: ["Trigger PR CI"]
+    workflows: [ "Trigger PR CI" ]
     types:
       - completed
 env:
@@ -11,7 +11,11 @@ env:
   GH_USER_EMAIL: 140449482+dsp-developers@users.noreply.github.com
   GH_USER_NAME: dsp-developers
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   fetch-data:
+    needs: gatekeeper
     name: Fetch workflow payload
     runs-on: ubuntu-latest
     if: >

.github/workflows/build-tools-images.yml

@@ -1,19 +1,19 @@
 name: Build tools images
 
 # This workflow is disabled for downstream.
-on: []
-#  push:
-#    branches:
-#      - master
-#      - main
-#      - stable
-#      - 'release-*'
-#      - 'rhoai-*'
-#  pull_request:
-#    branches:
-#      - master
-#      - 'release-*'
-#  workflow_dispatch: {}
+on:
+  push:
+    branches:
+      - master
+      - main
+      - stable
+      - 'release-*'
+      - 'rhoai-*'
+  pull_request:
+    branches:
+      - master
+      - 'release-*'
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -29,7 +29,11 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   build-tools:
+    needs: gatekeeper
     name: Build tools images
     runs-on: ubuntu-latest
     steps:

.github/workflows/cancel.yml

@@ -0,0 +1,31 @@
+name: Cancel
+on: []
+#  workflow_run:
+#    id: gatekeeper
+#    workflows: [ "Gatekeeper" ]
+#    types:
+#      - completed
+
+jobs:
+  cancel:
+    name: 'Cancel Previous Runs'
+    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion != 'success' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 3
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/workflows
+          sparse-checkout-cone-mode: false
+
+      - name: Build workflow list
+        id: workflows
+        run: |
+          ids=$(ls .github/workflows/ \
+            | grep -v -e '^cancel\.yml$' -e '^gatekeeper\.yml$' \
+            | paste -sd ',' -)
+          echo "ids=$ids" >> "$GITHUB_OUTPUT"
+
+      - uses: styfle/cancel-workflow-action
+        with:
+          workflow_id: ${{ steps.workflows.outputs.ids }}

.github/workflows/ci-checks.yml

@@ -4,13 +4,13 @@ name: CI Check
 on:
   pull_request_target:
     types: [opened, synchronize, reopened, labeled, unlabeled]
-  workflow_run:
-    workflows: [ "Stable Merge Integration Test Check" ] # Triggers when "Stable Merge Integration Test Check" succeeds
-    types: [completed]
-    branches: [stable]
 
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   check_ci_status:
+    needs: gatekeeper
     runs-on: ubuntu-latest
     permissions:
       checks: read

.github/workflows/commit-check-pr.yml

@@ -9,7 +9,11 @@ env:
   GH_USER_EMAIL: 140449482+dsp-developers@users.noreply.github.com
   GH_USER_NAME: dsp-developers
 jobs:
+  gatekeeper:
+    uses: ./.github/workflows/wait-for-gatekeeper.yml
+
   fetch-data:
+    needs: gatekeeper
     name: Fetch workflow payload
     runs-on: ubuntu-latest
     if: >