From 3b5b3be68ab0d02594f4c72bcbb78799981c4347 Mon Sep 17 00:00:00 2001
From: David Zager <dzager@redhat.com>
Date: Wed, 13 Dec 2023 15:38:42 -0500
Subject: [PATCH] :seedling: parallelize image build (#1618)

<!--
## PR Title Prefix

Every **PR Title** should be prefixed with :text: to indicate its type.

- Breaking change: :warning: (`:warning:`)
- Non-breaking feature: :sparkles: (`:sparkles:`)
- Patch fix: :bug: (`:bug:`)
- Docs: :book: (`:book:`)
- Infra/Tests/Other: :seedling: (`:seedling:`)
- No release note: :ghost: (`:ghost:`)

For example, a pull request containing breaking changes might look like
`:warning: My pull request contains breaking changes`.

Since GitHub supports emoji aliases (ie. `:ghost:`), there is no need to
include
the emoji directly in the PR title -- **please use the alias**. It used
to be
the case that projects using emojis for PR typing had to include the
emoji
directly because GitHub didn't render the alias. Given that `:warning:`
is
easy enough to read as text, easy to parse in release tooling, and
rendered in
GitHub well, we prefer to standardize on the alias.

For more information, please see the Konveyor
[Versioning
Doc](https://github.com/konveyor/release-tools/blob/main/VERSIONING.md).
-->

Signed-off-by: David Zager <dzager@redhat.com>
---
 .github/workflows/image-build.yaml           | 26 +++++++++++++++
 .github/workflows/march-image-build-push.yml | 33 --------------------
 2 files changed, 26 insertions(+), 33 deletions(-)
 create mode 100644 .github/workflows/image-build.yaml
 delete mode 100644 .github/workflows/march-image-build-push.yml

diff --git a/.github/workflows/image-build.yaml b/.github/workflows/image-build.yaml
new file mode 100644
index 0000000000..261d01674a
--- /dev/null
+++ b/.github/workflows/image-build.yaml
@@ -0,0 +1,26 @@
+name: Multiple Architecture Image Build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+      - 'release-*'
+    tags:
+      - 'v*'
+
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  image-build:
+    uses: konveyor/release-tools/.github/workflows/build-push-images.yaml@main
+    with:
+      registry: "quay.io/konveyor"
+      image_name: "tackle2-ui"
+      containerfile: "./Dockerfile"
+      architectures: '[ "amd64", "arm64", "ppc64le", "s390x" ]'
+    secrets:
+      registry_username: ${{ secrets.QUAY_PUBLISH_ROBOT }}
+      registry_password: ${{ secrets.QUAY_PUBLISH_TOKEN }}
diff --git a/.github/workflows/march-image-build-push.yml b/.github/workflows/march-image-build-push.yml
deleted file mode 100644
index f93448352c..0000000000
--- a/.github/workflows/march-image-build-push.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: 'Build and Push Multi-Arch Image'
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'main'
-      - 'release-*'
-    tags:
-      - 'v*'
-
-concurrency:
-  group: march-build-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  push-quay:
-    name: Build and Push Manifest
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-    steps:
-    - name: Checkout Push to Registry action
-      uses: konveyor/release-tools/build-push-quay@main
-      with:
-        architectures: "amd64, arm64, ppc64le, s390x"
-        containerfile: "./Dockerfile"
-        image_name: "tackle2-ui"
-        image_namespace: "konveyor"
-        image_registry: "quay.io"
-        quay_publish_robot: ${{ secrets.QUAY_PUBLISH_ROBOT }}
-        quay_publish_token: ${{ secrets.QUAY_PUBLISH_TOKEN }}
-        ref: ${{ github.ref }}