From deb49243d5ef41c1097b528562e57b1763908e9a Mon Sep 17 00:00:00 2001 From: Pavel Negrobov Date: Tue, 9 Apr 2024 18:14:50 +0300 Subject: [PATCH] =?UTF-8?q?INF-1239:=20=D0=9D=D0=B5=20=D0=B2=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D1=8F=D1=82=D1=8C=20=D0=B2=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D0=B5=D1=80=D0=B0=D1=85=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= =?UTF-8?q?,=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BD=D0=B0=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- runtests-jenkins.sh | 6 ++++++ tests/p_systemd/20-systemctl_list-service-status.sh | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) 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" -- 2.36.5