Browse Source

Run freshclam; indicate failure if a regression test fails.

master
Dianne Skoll 1 month ago
parent
commit
dbd7b6fec4
Signed by: dianne
GPG Key ID: 685A5A5E511D30E2
  1. 6
      docker/run-all-regression-tests
  2. 2
      docker/run-regression-tests-on-docker

6
docker/run-all-regression-tests

@ -4,11 +4,17 @@ if test "`uname -m`" = 'armv7l'; then
# Cannot run Rocky on Raspberry Pi
ROCKY=
fi
EXITCODE=0
cd `dirname $0`
for os in buster bullseye $ROCKY; do
for mta in postfix sendmail; do
echo "RUNNING TESTS: $mta $os"
./run-regression-tests-on-docker $mta $os "$@"
if test "$?" != 0 ; then
EXITCODE=$?
fi
done
done
exit $EXITCODE

2
docker/run-regression-tests-on-docker

@ -118,9 +118,11 @@ fi
docker exec "$CONTAINER" /bin/sh -c "cp /root/docker-testfiles/etc-default-mailmunge /etc/default/mailmunge"
docker exec "$CONTAINER" /bin/sh -c "/etc/init.d/mailmunge restart"
if test "$FLAVOR" = "debian" ; then
docker exec "$CONTAINER" freshclam -v
docker exec "$CONTAINER" /bin/sh -c "/etc/init.d/clamav-daemon restart; /etc/init.d/rsyslog start; /etc/init.d/rspamd start"
else
echo "Starting services..."
docker exec "$CONTAINER" freshclam -v
docker exec "$CONTAINER" /bin/sh -c "pkill -9 -u _rspamd; mkdir /var/run/clamav; chown clamscan /var/run/clamav; mkdir /var/run/rspamd; chown _rspamd /var/run/rspamd; clamd; syslog-ng" > /dev/null 2>&1
# rspamd on CentOS does something very weird if it daemonizes itself;
# it makes docker exe commands hang. Hence this awful hack

Loading…
Cancel
Save