From 80307f5cc20c9b7fa4cfffe42d90de14ce5c0573 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jul 24 2019 20:19:50 +0000 Subject: Test the right Java versions in CentOS8 --- diff --git a/tests/p_java-openjdk/p_java-openjdk-common b/tests/p_java-openjdk/p_java-openjdk-common index e7ff43e..f101e3f 100644 --- a/tests/p_java-openjdk/p_java-openjdk-common +++ b/tests/p_java-openjdk/p_java-openjdk-common @@ -4,11 +4,15 @@ [ ${centos_ver} -lt 7 ] && { t_Log "Multiple java versions test is only available since el7, skipping tests..." ; exit ; } +if [ ${centos_ver} -eq 8 ];then +JAVA_VERSIONS="1.8.0 11" +else JAVA_VERSIONS="1.7.0 1.8.0 11" if (t_GetArch | grep -qvE 'aarch64|ppc64le') then JAVA_VERSIONS="1.6.0 $JAVA_VERSIONS" fi +fi [ -z "${JAVA_VERSIONS}" ] && { t_Log "No java versions to test, skipping tests..." ; exit ; }