Test images in main (#1180)

Signed-off-by: Eric Sauer <esauer@redhat.com>

Author: etsauer

.github/workflows/test-images.yml

@@ -49,7 +49,6 @@ jobs:
 
   create-images:
     runs-on: ubuntu-latest
-    if: ${{ needs.setup.outputs.pr_type != 'closed' }}
     needs: setup
     steps:
       - name: Checkout code
@@ -61,7 +60,7 @@ jobs:
         uses: "./.github/workflow_templates/build_push_exporters"
         with:
           image: rc-pelorus-exporter
-          tags: vpr${{ needs.setup.outputs.pr_number }}-${{ needs.setup.outputs.commit_hash }}
+          tags: needs.setup.outputs.commit_hash
           quay_imagenamespace: ${{ secrets.QUAY_IMAGE_NAMESPACE }}
           quay_username: ${{ secrets.QUAY_USERNAME }}
           quay_password: ${{ secrets.QUAY_PASSWORD }}
@@ -75,7 +74,7 @@ jobs:
 
       - name: Use test images in operator
         env:
-          TEST_VERSION: pr${{ needs.setup.outputs.pr_number }}-${{ needs.setup.outputs.commit_hash }}
+          TEST_VERSION: needs.setup.outputs.commit_hash
         working-directory: ./pelorus-operator
         run: |
           export CURRENT_OPERATOR_VERSION="$(grep "^VERSION ?= " Makefile  | cut -c 12-)"
@@ -106,20 +105,21 @@ jobs:
         working-directory: ./pelorus-operator
         run: |
           make podman-build
-          podman image ls -a | grep pr${{ needs.setup.outputs.pr_number }}-${{ needs.setup.outputs.commit_hash }}
+          podman image ls -a | grep ${{ needs.setup.outputs.commit_hash }}
           podman image ls -a | grep rc-pelorus-operator
           make podman-push
 
       - name: Build and push operator bundle test image
         working-directory: ./pelorus-operator
         run: |
           make bundle-build
-          podman image ls -a | grep pr${{ needs.setup.outputs.pr_number }}-${{ needs.setup.outputs.commit_hash }}
+          podman image ls -a | grep ${{ needs.setup.outputs.commit_hash }}
           podman image ls -a | grep rc-pelorus-operator-bundle
           make bundle-push
 
       # TODO delete old comments, just have the last on PR
       - name: Comment test command in PR
+        if: ${{ github.event_name == 'pull_request' }}
         uses: "./.github/workflow_templates/comment-pr"
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/trigger-test-images.yml

@@ -2,7 +2,9 @@ name: Trigger test images
 
 on:
   push:
-    branches: [ main ]
+    branches:
+    - main
+    - test-images-**
   pull_request:
     branches: [ main ]
     paths: