split UBI builds for RH only

Author: benashz

.github/workflows/build.yaml

@@ -207,23 +207,59 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        arch: ["arm64", "amd64", "s390x", "ppc64le"]
+        arch: ["arm64", "amd64"]
     env:
       repo: ${{github.event.repository.name}}
       version: ${{needs.get-product-version.outputs.product-version}}
       image_tag: ${{needs.get-product-version.outputs.product-version}}-ubi
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Clean dist
+      #- name: Clean dist
+      #  shell: bash
+      #  run: |
+      #    make clean-dist
+      - name: Setup scripts directory
         shell: bash
         run: |
-          make clean-dist
+          make ci-build-scripts-dir GOARCH="${{ matrix.arch }}"
+      - name: Docker Build (Action)
+        uses: hashicorp/actions-docker-build@v2
+        env:
+          VERSION: ${{ needs.get-product-version.outputs.product-version }}
+          GO_VERSION: ${{ needs.build-pre-checks.outputs.go-version }}
+        with:
+          version: ${{env.version}}
+          target: release-ubi
+          arch: ${{matrix.arch}}
+          redhat_tag: quay.io/redhat-isv-containers/64b072322e2773c28d30d988:${{env.image_tag}}
+          tags: |
+            docker.io/hashicorp/${{env.repo}}:${{env.image_tag}}
+            public.ecr.aws/hashicorp/${{env.repo}}:${{env.image_tag}}
+  build-docker-ubi-rh-only:
+    name: UBI ${{ matrix.arch }} build
+    needs:
+      - get-product-version
+      - build-pre-checks
+      - build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: ["s390x", "ppc64le"]
+    env:
+      repo: ${{github.event.repository.name}}
+      version: ${{needs.get-product-version.outputs.product-version}}
+      image_tag: ${{needs.get-product-version.outputs.product-version}}-ubi
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      #- name: Clean dist
+      #  shell: bash
+      #  run: |
+      #    make clean-dist
       - name: Setup scripts directory
         shell: bash
         run: |
           make ci-build-scripts-dir GOARCH="${{ matrix.arch }}"
       - name: Docker Build (Action)
-        if: ${{ matrix.arch != 's390x' || matrix.arch != 'ppc64le' }}
         uses: hashicorp/actions-docker-build@v2
         env:
           VERSION: ${{ needs.get-product-version.outputs.product-version }}
@@ -236,8 +272,7 @@ jobs:
           tags: |
             docker.io/hashicorp/${{env.repo}}:${{env.image_tag}}
             public.ecr.aws/hashicorp/${{env.repo}}:${{env.image_tag}}
-      - name: Docker Build (Action) s390x or ppc64le
-        if: ${{ matrix.arch == 's390x' || matrix.arch == 'ppc64le' }}
+      - name: Docker Build (Action)
         uses: hashicorp/actions-docker-build@v2
         env:
           VERSION: ${{ needs.get-product-version.outputs.product-version }}
@@ -248,8 +283,6 @@ jobs:
           arch: ${{matrix.arch}}
           redhat_tag: quay.io/redhat-isv-containers/64b072322e2773c28d30d988:${{env.image_tag}}
       - name: Check binary version in container ${{ matrix.arch }}
-        #if: ${{ matrix.arch != 's390x' || matrix.arch != 'ppc64le' }}
-        if: ${{ matrix.arch != 's390x' }}
         shell: bash
         run: |
           version_output=$(docker run --platform linux/${{matrix.arch}} hashicorp/${{env.repo}}:${{env.image_tag}} --version --output=json)