From 33b1ed5993093b0439f3ac92bca382081788163a Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@mister-muffin.de>
Date: Wed, 26 Aug 2020 09:44:29 +0200
Subject: [PATCH] coverage.sh: test ubuntu focal

---
 coverage.sh    | 37 ++++++++++++++++++++++++++++++++++++-
 make_mirror.sh |  2 +-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/coverage.sh b/coverage.sh
index 0a43795..09e726f 100755
--- a/coverage.sh
+++ b/coverage.sh
@@ -35,6 +35,7 @@ rm -f shared/cover_db.img
 : "${DEFAULT_DIST:=unstable}"
 : "${HAVE_QEMU:=yes}"
 : "${RUN_MA_SAME_TESTS:=yes}"
+: "${ONLINE:=no}"
 
 HOSTARCH=$(dpkg --print-architecture)
 
@@ -86,7 +87,7 @@ if [ ! -e shared/hooks/eatmydata/customize.sh ] || [ hooks/eatmydata/customize.s
 fi
 
 starttime=
-total=150
+total=151
 skipped=0
 runtests=0
 i=1
@@ -3159,6 +3160,40 @@ END
 	fi
 done
 
+print_header "mode=$defaultmode,variant=apt: test ubuntu focal"
+cat << END > shared/test.sh
+#!/bin/sh
+set -eu
+export LC_ALL=C.UTF-8
+if ! /usr/lib/apt/apt-helper download-file http://archive.ubuntu.com/ubuntu/dists/focal/Release /dev/null && grep "QEMU Virtual CPU" /proc/cpuinfo; then
+	if [ ! -e /mmdebstrap-testenv ]; then
+		echo "this test modifies the system and should only be run inside a container" >&2
+		exit 1
+	fi
+	ip link set dev ens3 up
+	ip addr add 10.0.2.15/24 dev ens3
+	ip route add default via 10.0.2.2 dev ens3
+	echo "nameserver 10.0.2.3" > /etc/resolv.conf
+fi
+$CMD --mode=$defaultmode --variant=apt --customize-hook='grep UBUNTU_CODENAME=focal "\$1/etc/os-release"' focal /dev/null
+END
+if [ "$ONLINE" = "yes" ]; then
+	if [ "$HAVE_QEMU" = "yes" ]; then
+		./run_qemu.sh
+		runtests=$((runtests+1))
+	elif [ "$defaultmode" = "root" ]; then
+		./run_null.sh SUDO
+		runtests=$((runtests+1))
+	else
+		./run_null.sh
+		runtests=$((runtests+1))
+	fi
+else
+	echo "HOSTARCH != amd64 -- Skipping test..." >&2
+	skipped=$((skipped+1))
+fi
+
+
 if [ -e shared/cover_db.img ]; then
 	# produce report inside the VM to make sure that the versions match or
 	# otherwise we might get:
diff --git a/make_mirror.sh b/make_mirror.sh
index a10b832..25d42ef 100755
--- a/make_mirror.sh
+++ b/make_mirror.sh
@@ -424,7 +424,7 @@ if [ "$HAVE_QEMU" = "yes" ]; then
 	tmpdir="$(mktemp -d)"
 	trap "cleanuptmpdir; cleanup_newcachedir" EXIT INT TERM
 
-	pkgs=perl-doc,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-static,binfmt-support,qemu-user,dpkg-dev,mini-httpd,libdevel-cover-perl,libtemplate-perl,debootstrap,procps,apt-cudf,aspcud,squashfs-tools-ng,genext2fs,python3,libcap2-bin,gpg
+	pkgs=perl-doc,systemd-sysv,perl,arch-test,fakechroot,fakeroot,mount,uidmap,qemu-user-static,binfmt-support,qemu-user,dpkg-dev,mini-httpd,libdevel-cover-perl,libtemplate-perl,debootstrap,procps,apt-cudf,aspcud,squashfs-tools-ng,genext2fs,python3,libcap2-bin,gpg,debootstrap,distro-info-data,iproute2,ubuntu-keyring
 	if [ "$HAVE_PROOT" = "yes" ]; then
 		pkgs="$pkgs,proot"
 	fi