From 40499d861bcde9e618be56e5a35181b81d551096 Mon Sep 17 00:00:00 2001
From: Modassar Rana <modassar.rana@ibm.com>
Date: Thu, 22 Aug 2024 12:36:28 +0530
Subject: [PATCH] task: Temporary remove s390x support (PROJQUAY-7673) (#3140)

Update build-and-publish.yaml

Removed s390x changes temporarily . Updating s390x instance with sudo user & same will be updated in this workflow
---
 .github/workflows/build-and-publish.yaml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
index c50ef662ce..bb0c37fc19 100644
--- a/.github/workflows/build-and-publish.yaml
+++ b/.github/workflows/build-and-publish.yaml
@@ -39,8 +39,6 @@ jobs:
           BUILDER_PPC64LE_SSH_CONFIG: ${{ secrets.BUILDER_PPC64LE_SSH_CONFIG }}
           BUILDER_PPC64LE_SSH_KEY: ${{ secrets.BUILDER_PPC64LE_SSH_KEY }}
           BUILDER_PPC64LE_SSH_KNOWN_HOSTS: ${{ secrets.BUILDER_PPC64LE_SSH_KNOWN_HOSTS }}
-          BUILDER_S390X_SSH_HOST: ${{ secrets.BUILDER_S390X_SSH_HOST }}
-          BUILDER_S390X_SSH_KEY: ${{ secrets.BUILDER_S390X_SSH_KEY }}
         run: |
           mkdir ~/.ssh
           chmod 700 ~/.ssh
@@ -53,10 +51,6 @@ jobs:
           chmod 600 ~/.ssh/id_builder_ppc64le
           echo "$BUILDER_PPC64LE_SSH_KEY" >~/.ssh/id_builder_ppc64le
           
-          touch ~/.ssh/id_builder_s390x
-          chmod 600 ~/.ssh/id_builder_s390x
-          echo "$BUILDER_S390X_SSH_KEY" > ~/.ssh/id_builder_s390x
-          
           touch ~/.ssh/known_hosts
           chmod 600 ~/.ssh/known_hosts
           cat >~/.ssh/known_hosts <<END
@@ -75,12 +69,6 @@ jobs:
             IdentityFile "~/.ssh/id_builder_ppc64le"
           $BUILDER_PPC64LE_SSH_CONFIG
           
-          Host builder-s390x
-            StrictHostKeyChecking no
-            HostName $BUILDER_S390X_SSH_HOST
-            User root
-            IdentityFile "~/.ssh/id_builder_s390x"
-          END
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -91,8 +79,6 @@ jobs:
               platforms: linux/arm64
             - endpoint: ssh://builder-ppc64le
               platforms: linux/ppc64le
-            - endpoint: ssh://builder-s390x
-              platforms: linux/s390x
 
       - name: Login to Quay.io
         uses: docker/login-action@v1
@@ -107,7 +93,7 @@ jobs:
         env:
           TAG: ${{ steps.version-from-branch.outputs.version }}${{ env.TAG_SUFFIX }}
         with:
-          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
+          platforms: linux/amd64,linux/arm64,linux/ppc64le
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.REPO_NAME }}:${{ github.event.inputs.tag || env.TAG }}