Merge pull request #1416 from dannyzaken/danny-fixes

Fixed 'Build Bundle' step in manaual-build workflow
noobaa · Aug 21, 2024 · a32b7b4 · a32b7b4
2 parents 39e6c7d + 1c2867b
commit a32b7b4
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
@@ -1,14 +1,14 @@
 name: Manual Operator Build Dispatch
 
-on: 
+on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Branch to Build From'
+        description: "Branch to Build From"
         required: true
       tag:
-        description: 'Additional tag for the build (such as alpha, beta, etc.) - Optional'
-        default: ''
+        description: "Additional tag for the build (such as alpha, beta, etc.) - Optional"
+        default: ""
 
 jobs:
   publish-image:
@@ -74,17 +74,18 @@ jobs:
         env:
           DOCKERHUB_OWNER: ${{ secrets.GHACTIONSDOCKERHUBNAME }}
         run: |
-            make image VERSION=latest
-            docker tag  noobaa/noobaa-operator ${{ steps.prep.outputs.operatortags }}
-            docker push ${{ steps.prep.outputs.operatortags }}
+          make image VERSION=latest
+          docker tag  noobaa/noobaa-operator ${{ steps.prep.outputs.operatortags }}
+          docker push ${{ steps.prep.outputs.operatortags }}
 
       - name: Build Bundle
         run: |
           make bundle-image \
           csv-name=noobaa-operator.clusterserviceversion.yaml \
           core-image=quay.io/${{ github.event.inputs.branch }}-${{ steps.prep.outputs.version }}${{ steps.suffix.outputs.suffix }} \
           operator-image=quay.io/${{ steps.prep.outputs.operatortags }} \
-          db-image=centos/postgresql-12-centos7 \
+          db-image=centos/postgresql-15-centos7 \
+          psql-12-image=centos/postgresql-12-centos7 \
           obc-crd="owned" \
           BUNDLE_IMAGE=quay.io/${{ steps.prep.outputs.operatorbundletags }}
 
@@ -95,9 +96,9 @@ jobs:
         env:
           DOCKERHUB_OWNER: ${{ secrets.GHACTIONQUAYNAME }}
         run: |
-            docker tag ${{ steps.prep.outputs.operatortags }} quay.io/${{ steps.prep.outputs.operatortags }} 
-            docker push quay.io/${{ steps.prep.outputs.operatortags }} 
-            docker push quay.io/${{ steps.prep.outputs.operatorbundletags }}
+          docker tag ${{ steps.prep.outputs.operatortags }} quay.io/${{ steps.prep.outputs.operatortags }} 
+          docker push quay.io/${{ steps.prep.outputs.operatortags }} 
+          docker push quay.io/${{ steps.prep.outputs.operatorbundletags }}
 
       - name: Push to ocs-dev as latest
         env:
@@ -108,7 +109,7 @@ jobs:
           docker push quay.io/${{ steps.prep.outputs.ocsdevlatest }}
 
       - name: Push CLI Binary
-        run: |         
+        run: |
           make cli
           make release-cli VERSION=-${{ github.event.inputs.branch }}-${{ steps.prep.outputs.version }}${{ steps.suffix.outputs.suffix }}
           #noobaa-operator-cli