Fix conftest and prometheus_rules tests and see if we can get test bundle to build off of main (#1179)

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

Author: etsauer

.github/workflows/cd.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - main
 
 env:
   # TODO create bot account

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

@@ -1,6 +1,8 @@
 name: Trigger test images
 
 on:
+  push:
+    branches: [ main ]
   pull_request:
     branches: [ main ]
     paths:
@@ -30,7 +32,7 @@ jobs:
               '"pr_number":"${{ github.event.number }}",' \
               '"commit_hash":"${{ needs.get-short-sha.outputs.sha }}"}' > trigger-information.json
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: trigger-information
           path: ./trigger-information.json