Matrix strat

Signed-off-by: Joseph <[email protected]>

Author: Joeavaikath

.github/workflows/quay_binaries_push.yml

@@ -12,48 +12,90 @@ on:
 jobs:
 
   multi-arch-build:
-    name: Multi-Arch Build
+    name: Build Multi-Arch Images
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64, arm64, ppc64le, s390x]
     steps:
 
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+          cache: true
+
       - name: Install qemu dependency
         run: |
           sudo apt-get update
           sudo apt-get install -y qemu-user-static
       
-      - name: Build Image
-        id: build_image_multiarch
+      - name: Build Image for ${{ matrix.arch }}
+        id: build_image
         uses: redhat-actions/buildah-build@v2
         with:
-          image: quay.io/konveyor/oadp-cli-binaries
-          tags: ${{ github.ref_type == 'tag' && format('latest {0}', github.ref_name) || 'test' }}
-          archs: amd64,arm64,ppc64le,s390x
+          image: oadp-cli-binaries-local
+          tags: ${{ matrix.arch }}
+          archs: ${{ matrix.arch }}
           containerfiles: |
             ./Containerfile.download
 
-      - name: Echo Outputs
+      - name: Save image as tar
         run: |
-          echo "Image: ${{ steps.build_image_multiarch.outputs.image }}"
-          echo "Tags: ${{ steps.build_image_multiarch.outputs.tags }}"
-          echo "Tagged Image: ${{ steps.build_image_multiarch.outputs.image-with-tag }}"
-    
-      - name: Check images created
-        run: buildah images | grep 'quay.io/konveyor/oadp-cli-binaries'
+          buildah push ${{ steps.build_image.outputs.image-with-tag }} oci-archive:oadp-cli-${{ matrix.arch }}.tar
+
+      - name: Upload image artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: oadp-cli-image-${{ matrix.arch }}
+          path: oadp-cli-${{ matrix.arch }}.tar
+          retention-days: 1
+
+  push-manifest:
+    name: Create and Push Multi-Arch Manifest
+    runs-on: ubuntu-latest
+    needs: multi-arch-build
+    if: startsWith(github.ref_name, 'v')
+    steps:
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: oadp-cli-image-*
 
-      - name: Check manifest
+      - name: Load images and create manifest
         run: |
-          set -x
-          buildah manifest inspect ${{ steps.build_image_multiarch.outputs.image-with-tag }}
+          # Load all arch images
+          buildah pull oci-archive:oadp-cli-image-amd64/oadp-cli-amd64.tar
+          buildah pull oci-archive:oadp-cli-image-arm64/oadp-cli-arm64.tar
+          buildah pull oci-archive:oadp-cli-image-ppc64le/oadp-cli-ppc64le.tar
+          buildah pull oci-archive:oadp-cli-image-s390x/oadp-cli-s390x.tar
+          
+          # Tag them for manifest
+          buildah tag localhost/oadp-cli-binaries-local:amd64 quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-amd64
+          buildah tag localhost/oadp-cli-binaries-local:arm64 quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-arm64
+          buildah tag localhost/oadp-cli-binaries-local:ppc64le quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-ppc64le
+          buildah tag localhost/oadp-cli-binaries-local:s390x quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-s390x
+
       - name: Buildah login
         run: buildah login -u ${{ secrets.QUAY_USER }} -p ${{ secrets.QUAY_TOKEN }} quay.io
-      
-      - name: Buildah push version tag
-        if: startsWith(github.ref_name, 'v')
-        run: buildah manifest push ${{ steps.build_image_multiarch.outputs.image-with-tag }} quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}
-      
-      - name: Buildah push latest tag
-        if: startsWith(github.ref_name, 'v')
-        run: buildah manifest push ${{ steps.build_image_multiarch.outputs.image-with-tag }} quay.io/konveyor/oadp-cli-binaries:latest
+
+      - name: Create and push version manifest
+        run: |
+          buildah manifest create quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }} quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-amd64
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }} quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-arm64
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }} quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-ppc64le
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }} quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-s390x
+          buildah manifest push --all quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}
+
+      - name: Create and push latest manifest
+        run: |
+          buildah manifest create quay.io/konveyor/oadp-cli-binaries:latest
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:latest quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-amd64
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:latest quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-arm64
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:latest quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-ppc64le
+          buildah manifest add quay.io/konveyor/oadp-cli-binaries:latest quay.io/konveyor/oadp-cli-binaries:${{ github.ref_name }}-s390x
+          buildah manifest push --all quay.io/konveyor/oadp-cli-binaries:latest