diff --git a/runtests-jenkins.sh b/runtests-jenkins.sh index 88ffc49..396e554 100755 --- a/runtests-jenkins.sh +++ b/runtests-jenkins.sh @@ -7,6 +7,12 @@ fi echo -e "\n[+] `date` -> CentOS QA $0 starting." +if [ -f /.dockerenv ]; then + export CONTAINERTEST=1 +else + export CONTAINERTEST=0 +fi + yum -d0 -y install bind-utils hostname if [ "$?" -ne "0" ] ;then diff --git a/tests/p_systemd/20-systemctl_list-service-status.sh b/tests/p_systemd/20-systemctl_list-service-status.sh index d7edfb1..6728d77 100755 --- a/tests/p_systemd/20-systemctl_list-service-status.sh +++ b/tests/p_systemd/20-systemctl_list-service-status.sh @@ -1,10 +1,11 @@ #!/bin/bash -x # Author: Rene Diepstraten -# 28.03.2024 Pavel Negrobov -- skip для MSVSphere ОС +# 10.04.2024 Pavel Negrobov -- skip для docker environment (auditd is absent) -# https://inferitos.asproagile.ru/_module/agile/view/issue/1285 -t_Log "Running $0 - skip for MSVSphere. Please see https://inferitos.asproagile.ru/_module/agile/view/issue/1285" -exit 0 +if [ "$CONTAINERTEST" -eq 1 ] ; then + echo "Container/Docker environment detected. Skipping this test ..." + exit 0 +fi [ ${centos_ver} -lt 7 ] && exit t_Log "Running $0 - checking if systemctl can check a service status"