fix neglected push triggers

.github/template/prepare-test/action.yaml

@@ -26,7 +26,7 @@ runs:
       run: "./hack/await_image.sh"
       env:
         GITHUB_TOKEN: "${{ inputs.github-token }}"
-        COMMIT_SHA: "${{ github.event.pull_request.head.sha }}"
+        TRIGGER: "${{ github.event.pull_request.head.sha }}"
         QUERY_INTERVAL: 30
         IMAGE_REPO: "europe-docker.pkg.dev/kyma-project/dev/telemetry-manager"
 

.github/workflows/branch-integration.yml

@@ -30,10 +30,12 @@ jobs:
 
     # wait for the build to succeed so that the manager image is available
     - name: Wait for the image to be available in the registry
-      run: "./hack/await_image.sh ${{ github.ref_name }}"
+      run: "./hack/await_image.sh"
       env:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         IMAGE_REPO: "europe-docker.pkg.dev/kyma-project/prod/telemetry-manager"
+        TRIGGER: "${{ github.ref_name }}"
+        QUERY_INTERVAL: 30
 
     # save gardener kubeconfig to a temp file in order to pass it to the command
     - name: Save serviceaccount to file

.github/workflows/pr-lifecycle.yml

@@ -61,7 +61,7 @@ jobs:
         run: "./hack/await_image.sh"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          COMMIT_SHA: "${{ github.event.pull_request.head.sha }}"
+          TRIGGER: "${{ github.event.pull_request.head.sha }}"
           QUERY_INTERVAL: 30
           IMAGE_REPO: "europe-docker.pkg.dev/kyma-project/dev/telemetry-manager"
 

.github/workflows/tag-release.yml

@@ -15,10 +15,12 @@ jobs:
 
       # wait for the build to succeed so that the manager image is available
       - name: Wait for the image to be available in the registry
-        run: "./hack/await_image.sh ${{ github.ref_name }}"
+        run: "./hack/await_image.sh"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           IMAGE_REPO: "europe-docker.pkg.dev/kyma-project/prod/telemetry-manager"
+          TRIGGER: "${{ github.ref_name }}"
+          QUERY_INTERVAL: 30
 
       - name: Install tools
         shell: bash

hack/await_image.sh

@@ -9,7 +9,7 @@ set -o pipefail # prevents errors in a pipeline from being masked
 # Expected variables:
 #             IMAGE_REPO - binary image repository
 #             GITHUB_TOKEN - github token
-#             COMMIT_SHA - commit SHA which triggered the workflow
+#             TRIGGER - event which triggered the workflow, for PRs it is the commit SHA, for push events it is the GITHUB_REF
 #             QUERY_INTERVAL - time to wait between queries in seconds
 
 PROTOCOL=docker://
@@ -18,14 +18,14 @@ PROTOCOL=docker://
 TIMEOUT=900
 START_TIME=$SECONDS
 
-until $(skopeo list-tags ${PROTOCOL}${IMAGE_REPO} | jq '.Tags|any(. == env.COMMIT_SHA)'); do
+until $(skopeo list-tags ${PROTOCOL}${IMAGE_REPO} | jq '.Tags|any(. == env.TRIGGER)'); do
   if (( SECONDS - START_TIME > TIMEOUT )); then
     echo "Timeout reached: ${IMAGE_REPO}:${COMMIT_SHA} not found within $(( TIMEOUT/60 )) minutes"
     exit 1
   fi
-  echo "Waiting for binary image: ${IMAGE_REPO}:${COMMIT_SHA}"
-  echo "Commit SHA: $COMMIT_SHA"
+  echo "Waiting for binary image: ${IMAGE_REPO}:${TRIGGER}"
+  echo "Trigger: $TRIGGER"
   sleep "$QUERY_INTERVAL"
 done
 
-echo "Binary image: ${IMAGE_REPO}:${COMMIT_SHA} available"
+echo "Binary image: ${IMAGE_REPO}:${TRIGGER} available"