From: Michael Prokop <mika@grml.org>
Date: Thu, 7 Dec 2023 15:04:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/249'
X-Git-Tag: v0.105~3
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=f4cd240c8efda8f2ec5d3b487ee1af23f4f36599;hp=7d594c03476e603e878a0e7e8ff8a762ff4430a7;p=grml-debootstrap.git

Merge remote-tracking branch 'origin/pr/249'
---

diff --git a/tests/build-vm-and-test.sh b/tests/build-vm-and-test.sh
index 1dc4bbc..53076ac 100755
--- a/tests/build-vm-and-test.sh
+++ b/tests/build-vm-and-test.sh
@@ -34,7 +34,7 @@ fi
 if [ "$1" == "setup" ]; then
   [ -x ./tests/goss ] || curl -fsSL https://goss.rocks/install | GOSS_DST="$(pwd)/tests" sh
   sudo apt-get update
-  sudo apt-get -y install qemu-system-x86 kpartx python3-pexpect python3-serial
+  sudo apt-get -qq -y install qemu-system-x86 kpartx python3-pexpect python3-serial
   # TODO: docker.io
   exit 0
 fi
diff --git a/tests/docker-build-deb.sh b/tests/docker-build-deb.sh
index f9a8c8d..4320c82 100755
--- a/tests/docker-build-deb.sh
+++ b/tests/docker-build-deb.sh
@@ -18,7 +18,7 @@ if [ -z "$BUILD_NUMBER" ]; then
 fi
 
 apt-get update
-apt-get install --no-install-recommends -y build-essential devscripts equivs
+apt-get install -qq -y --no-install-recommends build-essential devscripts equivs
 
 SOURCEDIR=$PWD
 
diff --git a/tests/docker-build-vm.sh b/tests/docker-build-vm.sh
index 07578f7..0b210dd 100755
--- a/tests/docker-build-vm.sh
+++ b/tests/docker-build-vm.sh
@@ -16,7 +16,7 @@ TARGET="$2"
 RELEASE="$3"
 
 if [ -n "${DEBOOTSTRAP:-}" ] && [ "${DEBOOTSTRAP:-}" != "debootstrap" ]; then
-  apt-get install -y "${DEBOOTSTRAP}"
+  apt-get install -qq -y "${DEBOOTSTRAP}"
 fi
 
 set -x
diff --git a/tests/docker-install-deb.sh b/tests/docker-install-deb.sh
index 9ba38d0..b056952 100755
--- a/tests/docker-install-deb.sh
+++ b/tests/docker-install-deb.sh
@@ -15,5 +15,5 @@ DEB_NAME="$1"
 
 apt-get update
 # docker images can be relatively old, especially for unstable.
-apt-get -y upgrade
-apt-get -y install "$DEB_NAME"
+apt-get upgrade -qq -y
+apt-get install -qq -y "$DEB_NAME"