From 3855e30eb528a1ccbabcf9a342b28ae9780f2b38 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jul 28 2019 19:03:36 +0000 Subject: Tomcat not available in CentOS8, disable test --- diff --git a/tests/p_tomcat/0-install_tomcat.sh b/tests/p_tomcat/0-install_tomcat.sh index bcbcc13..6a6a680 100755 --- a/tests/p_tomcat/0-install_tomcat.sh +++ b/tests/p_tomcat/0-install_tomcat.sh @@ -1,6 +1,10 @@ #!/bin/bash # Author: Athmane Madjoudj +if [ "$centos_ver" -eq "8" ] ; then + t_Log "Tomcat is not available in CentOS$centos_ver. SKIP" + exit 0 +fi yum -y remove java\* if [ "$centos_ver" = "7" ] ;then diff --git a/tests/p_tomcat/1-config_tomcat.sh b/tests/p_tomcat/1-config_tomcat.sh index 10fc2ec..40ae553 100755 --- a/tests/p_tomcat/1-config_tomcat.sh +++ b/tests/p_tomcat/1-config_tomcat.sh @@ -1,5 +1,8 @@ #!/bin/bash # Author: Athmane Madjoudj +if [ "$centos_ver" -ge "8" ] ; then + exit 0 +fi uname_arch=$(uname -m) t_Log "$0 - Configuring Tomcat" diff --git a/tests/p_tomcat/tomcat_manager_test.sh b/tests/p_tomcat/tomcat_manager_test.sh index a576f28..9ea95f0 100755 --- a/tests/p_tomcat/tomcat_manager_test.sh +++ b/tests/p_tomcat/tomcat_manager_test.sh @@ -1,5 +1,8 @@ #!/bin/sh # Author: Athmane Madjoudj +if [ "$centos_ver" -ge "8" ] ; then + exit 0 +fi #uname_arch=$(uname -m) #if [ "$uname_arch" == "i686" ] ; then #t_Log "Skipping $0 on $uname_arch" diff --git a/tests/p_tomcat/tomcat_test.sh b/tests/p_tomcat/tomcat_test.sh index ee6e83a..352d088 100755 --- a/tests/p_tomcat/tomcat_test.sh +++ b/tests/p_tomcat/tomcat_test.sh @@ -1,6 +1,9 @@ #!/bin/sh # Author: Athmane Madjoudj +if [ "$centos_ver" -ge "8" ] ; then + exit 0 +fi uname_arch=$(uname -m) #if [ "$uname_arch" == "i686" ] ; then #t_Log "Skipping $0 on $uname_arch"