From f2efeab38468b988d9d4db2c9fab5a2235b3322f Mon Sep 17 00:00:00 2001
From: Marko Strukelj <marko.strukelj@gmail.com>
Date: Sun, 4 Feb 2024 20:52:02 +0100
Subject: [PATCH] Revert "Retry enabling Keycloak rebuild + testsuite run on
 s390x"

This reverts commit b5a7f8d062b6b7f1fc6e3675d2edfbad9b0026a8.

Signed-off-by: Marko Strukelj <marko.strukelj@gmail.com>
---
 .travis/build.sh | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/.travis/build.sh b/.travis/build.sh
index ec129717..7899bffc 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -48,33 +48,7 @@ if [ "$arch" != 'ppc64le' ]; then
 fi
 
 # Run testsuite
-if [ "$arch" == 's390x' ]; then
-  # Build s390x compatible hydra image
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/s390x-linux-gnu/jni
-
-  cd target
-  git clone -b 23.0.5 https://github.com/keycloak/keycloak.git
-  cd keycloak
-  mvn -q -pl quarkus/deployment,quarkus/dist -am -DskipTests clean install
-  cd quarkus/container
-  cp ../dist/target/keycloak-*.tar.gz .
-  docker build --build-arg KEYCLOAK_DIST=$(ls keycloak-*.tar.gz) . -t quay.io/keycloak/keycloak:23.0.5
-  cd ../../../.. && rm -rf target/keycloak
-
-  docker build --target hydra-import -t strimzi-oauth-testsuite/hydra-import:latest -f ./testsuite/docker/hydra-import/Dockerfile.s390x .
-
-  docker build --target oryd-hydra -t oryd/hydra:v1.8.5 -f ./testsuite/docker/hydra-import/Dockerfile.s390x .
-
-  mvn -q test-compile spotbugs:check -e -V -B -f testsuite
-  set +e
-  clearDockerEnv
-  mvn -e -V -B clean install -f testsuite -Pkafka-3_6_1
-  EXIT=$?
-  exitIfError
-  set -e
-
-elif [[ "$arch" != 'ppc64le' ]]; then
-
+if [ "$arch" != 'ppc64le' ] && [ "$arch" != 's390x' ]; then
   mvn test-compile spotbugs:check -e -V -B -f testsuite $MAVEN_EXTRA_ARGS
 
   set +e