From 0ba4feaf7a0864e8fd5b747a0ea6e03c58eb11d6 Mon Sep 17 00:00:00 2001
From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com>
Date: Tue, 24 Oct 2023 14:55:42 -0400
Subject: [PATCH] Revert "Stage and promote operator catalog and bundle
 (#1598)" (#1611)

---
 .github/workflows/promote.yaml | 21 ++-------------------
 .github/workflows/stage.yml    |  3 +--
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
index 1d2ade3d..93c70ef9 100644
--- a/.github/workflows/promote.yaml
+++ b/.github/workflows/promote.yaml
@@ -22,28 +22,11 @@ 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
index dcdbec2d..7ef76bf0 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -63,8 +63,7 @@ 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 bundle docker-build docker-push bundle-build bundle-push catalog-build catalog-push
+          VERSION=${{ github.event.inputs.version }} make docker-build docker-push
 
       - name: Run test deployment
         working-directory: awx-operator