Merge pull request #1621 from dprince/update_catalog_fixes

Update catalog fixes

Author: openshift-merge-bot[bot]

.github/workflows/catalog-openstack-operator-upgrades.yaml

@@ -1,10 +1,17 @@
 name: Build catalog for OLM upgrade testing
 
 on:
+
+  workflow_dispatch:
+    branches:
+      - '*'
+
   workflow_run:
     workflows: ["openstack operator image builder"]
     types:
       - completed
+    branches:
+      - '*'
     secrets:
       IMAGENAMESPACE:
         required: true
@@ -25,8 +32,6 @@ env:
 jobs:
   build-catalog:
     runs-on: ubuntu-latest
-    if: >
-      github.event.workflow_run.conclusion == 'success'
 
     steps:
     - name: Install Go
@@ -40,6 +45,15 @@ jobs:
       with:
         path: ./openstack-operator
 
+    - name: Get branch name
+      id: branch-name
+      uses: tj-actions/branch-names@v7
+
+    - name: Set latest tag for non main branch
+      if: "${{ steps.branch-name.outputs.current_branch != 'main' }}"
+      run: |
+        echo "latesttag=${{ steps.branch-name.outputs.current_branch }}-latest" >> $GITHUB_ENV
+
     - name: Install opm
       uses: redhat-actions/openshift-tools-installer@v1
       with: