INF-1239: Не выполнять в докерах тесты, не предназначенные для контейнеров (#5)

https://dev-ci.inferitos.ru/job/rpmTests/job/Docker_tests/6937/ -- audit

https://dev-ci.inferitos.ru/job/rpmTests/job/Docker_tests/6938/ -- systemd

Co-authored-by: Pavel Negrobov <Pavel.Negrobov@softline.com>
Reviewed-on: #5
pull/6/head
Pavel Negrobov 5 months ago
parent cbdba03f47
commit 9bcba08f4f

@ -7,6 +7,12 @@ fi
echo -e "\n[+] `date` -> CentOS QA $0 starting." 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 yum -d0 -y install bind-utils hostname
if [ "$?" -ne "0" ] ;then if [ "$?" -ne "0" ] ;then

@ -1,10 +1,11 @@
#!/bin/bash -x #!/bin/bash -x
# Author: Rene Diepstraten <rene@renediepstraten.nl> # Author: Rene Diepstraten <rene@renediepstraten.nl>
# 28.03.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- skip для MSVSphere ОС # 10.04.2024 Pavel Negrobov <pnegrobov@msvsphere-os.ru> -- skip для docker environment (auditd is absent)
# https://inferitos.asproagile.ru/_module/agile/view/issue/1285 if [ "$CONTAINERTEST" -eq 1 ] ; then
t_Log "Running $0 - skip for MSVSphere. Please see https://inferitos.asproagile.ru/_module/agile/view/issue/1285" echo "Container/Docker environment detected. Skipping this test ..."
exit 0 exit 0
fi
[ ${centos_ver} -lt 7 ] && exit [ ${centos_ver} -lt 7 ] && exit
t_Log "Running $0 - checking if systemctl can check a service status" t_Log "Running $0 - checking if systemctl can check a service status"

Loading…
Cancel
Save