From cfb94a62ae7df415f3abbc3927eb5ee1f7de287f Mon Sep 17 00:00:00 2001 From: Marko Strukelj Date: Thu, 15 Feb 2024 12:13:08 +0100 Subject: [PATCH] Enable s390x testsuite run Signed-off-by: Marko Strukelj --- .travis.yml | 7 +++++++ .travis/build.sh | 22 +++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1764383a..2e3c9414 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,13 @@ jobs: apt: packages: - maven + env: + - DOCKER_COMPOSE_VERSION=v2.24.5 + before_install: + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin - os: linux arch: ppc64le jdk: openjdk17 diff --git a/.travis/build.sh b/.travis/build.sh index 3fc80b21..9ec6c1dd 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -48,7 +48,27 @@ if [ "$arch" != 'ppc64le' ]; then fi # Run testsuite -if [ "$arch" != 'ppc64le' ] && [ "$arch" != 's390x' ]; then +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/quarkus/container + docker build . -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 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 mvn test-compile spotbugs:check -e -V -B -f testsuite $MAVEN_EXTRA_ARGS set +e