Fix various glitches in automated testing

Author: salcock

run-tests-rpm.sh

@@ -2,6 +2,7 @@
 
 set -x -e -o pipefail
 SOURCENAME=`echo ${CI_COMMIT_REF_NAME} | cut -d '-' -f 1`
+ZSTDREQ=zstd
 
 if [ "$1" = "centos8" ]; then
         yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
@@ -19,6 +20,7 @@ if [ "$1" = "centos8" ]; then
 
         wget -N https://archives.fedoraproject.org/pub/archive/epel/8.1/Everything/x86_64/Packages/z/zstd-1.4.4-1.el8.x86_64.rpm && rpm -i zstd-1.4.4-1.el8.x86_64.rpm
 
+        ZSTDREQ=
 fi
 
 if [ "$1" = "centos_7" ]; then
@@ -30,7 +32,7 @@ if [ "$1" = "centos_6" ]; then
         yum install -y epel-rpm-macros
 fi
 
-yum install -y xz zstd gzip bzip2 lzop lz4
+yum install -y xz ${ZSTDREQ} gzip bzip2 lzop lz4 diffutils
 
 yum install -y built-packages/$1/libwandio1-${SOURCENAME}-*.rpm
 yum install -y built-packages/$1/libwandio1-devel-${SOURCENAME}-*.rpm

run-tests.sh

@@ -2,6 +2,8 @@
 
 set -x -e -o pipefail
 
+export DEBIAN_FRONTEND=noninteractive
+
 apt-get update
 
 apt-get install -y curl apt-transport-https \