From b2c07964384c95cc1f019592d6774409887e988c Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jul 24 2019 20:18:41 +0000 Subject: Java 1.6 is not built in CentOS8 --- diff --git a/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh b/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh index 6304a31..38dfb35 100755 --- a/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh +++ b/tests/p_java-1.6.0-openjdk/0-install-openjdk.sh @@ -2,6 +2,10 @@ # Author: Christoph Galuschka # Install java +if [ $centos_ver -ge 8 ]; then + echo "Package not included in CentOS $centos_ver, skipping" + exit 0 +fi if (t_GetArch | grep -qE 'aarch64|ppc64le') then echo "Package not included for current arch, skipping" diff --git a/tests/p_java-1.6.0-openjdk/10-test_java.sh b/tests/p_java-1.6.0-openjdk/10-test_java.sh index a1c6e6f..93d6264 100755 --- a/tests/p_java-1.6.0-openjdk/10-test_java.sh +++ b/tests/p_java-1.6.0-openjdk/10-test_java.sh @@ -1,6 +1,10 @@ #!/bin/sh # Author: Christoph Galuschka +if [ $centos_ver -ge 8 ]; then + echo "Package not included in CentOS $centos_ver, skipping" + exit 0 +fi if (t_GetArch | grep -qE 'aarch64|ppc64le') then echo "Package not included for current arch, skipping"