diff --git a/.github/workflows/gatekeeper.yaml b/.github/workflows/gatekeeper.yaml index 547b9e0fb3..6dc741c255 100644 --- a/.github/workflows/gatekeeper.yaml +++ b/.github/workflows/gatekeeper.yaml @@ -28,6 +28,7 @@ jobs: env: TARGET_BRANCH: ${{ github.event.pull_request.base.ref }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COMMIT_HASH: ${{ github.event.pull_request.head.sha }} run: | #!/usr/bin/env bash -x mapfile -t lines < <(python3 tools/testing/gatekeeper/skips.py -t) diff --git a/tools/testing/gatekeeper/jobs.py b/tools/testing/gatekeeper/jobs.py index e7eb835418..94b6904293 100644 --- a/tools/testing/gatekeeper/jobs.py +++ b/tools/testing/gatekeeper/jobs.py @@ -42,6 +42,7 @@ _GH_RUNS_URL = ("https://api.github.com/repos/" class Checker: """Object to keep watching required GH action workflows""" def __init__(self): + self.latest_commit_sha = os.getenv("COMMIT_HASH") required_jobs = os.getenv("REQUIRED_JOBS") if required_jobs: required_jobs = required_jobs.split(",") @@ -151,10 +152,9 @@ class Checker: :returns: 0 - all passing; 1 - any failure; 127 some jobs running """ # TODO: Check if we need pagination here as well - latest_commit_sha = os.getenv("COMMIT_HASH") response = requests.get( _GH_RUNS_URL, - params={"head_sha": latest_commit_sha}, + params={"head_sha": self.latest_commit_sha}, headers=_GH_HEADERS, timeout=60 ) @@ -174,6 +174,8 @@ class Checker: :returns: 0 on success; 1 on failure """ + print(f"Gatekeeper for project={os.environ['GITHUB_REPOSITORY']} and " + f"SHA={self.latest_commit_sha}") while True: ret = self.check_workflow_runs_status() if ret == RUNNING: