Stage and promote operator catalog and bundle (#1598)

ansible · Oct 24, 2023 · d4c1fda · d4c1fda
1 parent 0d97183
commit d4c1fda
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
@@ -22,11 +22,28 @@ jobs:
 
       - name: Re-tag and promote awx-operator image
         run: |
+          # Promote operator image
           docker pull ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }}
-          docker tag ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} quay.io/${{ github.repository }}:${{ github.event.release.tag_name }}
-          docker tag ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} quay.io/${{ github.repository }}:latest
+          docker tag \
+            ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} \
+            quay.io/${{ github.repository }}:${{ github.event.release.tag_name }}
+          docker tag \
+            ghcr.io/${{ github.repository }}:${{ github.event.release.tag_name }} \
+            quay.io/${{ github.repository }}:latest
           docker push quay.io/${{ github.repository }}:${{ github.event.release.tag_name }}
           docker push quay.io/${{ github.repository }}:latest
+          # Promote bundle image
+          docker pull ghcr.io/${{ github.repository }}-bundle:v${{ github.event.release.tag_name }}
+          docker tag \
+            ghcr.io/${{ github.repository }}-bundle:v${{ github.event.release.tag_name }} \
+            quay.io/${{ github.repository }}-bundle:v${{ github.event.release.tag_name }}
+          docker push quay.io/${{ github.repository }}-bundle:v${{ github.event.release.tag_name }}
+          # Promote catalog image
+          docker pull ghcr.io/${{ github.repository }}-catalog:v${{ github.event.release.tag_name }}
+          docker tag \
+            ghcr.io/${{ github.repository }}-catalog:v${{ github.event.release.tag_name }} \
+            quay.io/${{ github.repository }}-catalog:v${{ github.event.release.tag_name }}
+          docker push quay.io/${{ github.repository }}-catalog:v${{ github.event.release.tag_name }}
 
       - name: Release Helm chart
         run: |

diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
@@ -63,7 +63,8 @@ jobs:
           BUILD_ARGS="--build-arg DEFAULT_AWX_VERSION=${{ github.event.inputs.default_awx_version }} \
                       --build-arg OPERATOR_VERSION=${{ github.event.inputs.version }}" \
           IMAGE_TAG_BASE=ghcr.io/${{ github.repository_owner }}/awx-operator \
-          VERSION=${{ github.event.inputs.version }} make docker-build docker-push
+          VERSION=${{ github.event.inputs.version }} \
+          make bundle docker-build docker-push bundle-build bundle-push catalog-build catalog-push
 
       - name: Run test deployment
         working-directory: awx-operator