[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: always bootstrap schroots using mmdebstrap

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
660c0017 by Holger Levsen at 2022-09-14T14:45:59+02:00
reproducible Debian: always bootstrap schroots using mmdebstrap

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/schroot-create.sh


Changes:

=====================================
bin/schroot-create.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright © 2012-2020 Holger Levsen <holger at layer-acht.org>
+# Copyright © 2012-2022 Holger Levsen <holger at layer-acht.org>
 #           ©      2013 Antonio Terceiro <terceiro at debian.org>
 #           ©      2014 Joachim Breitner <nomeata at debian.org>
 #           © 2015-2018 Mattia Rizzolo <mattia at debian.org>
@@ -134,28 +134,12 @@ bootstrap() {
 	. /srv/jenkins/bin/jenkins_node_definitions.sh
 	get_node_information "$HOSTNAME"
 
-	# choosing bootstrapping method
 	local DEBOOTSTRAP=()
-	if command -v mmdebstrap >/dev/null ; then
-		# not available on Ubuntu 16.04 LTS
-		DEBOOTSTRAP+=(mmdebstrap)
-		if "$NODE_RUN_IN_THE_FUTURE" ; then
-			# configure apt to ignore expired release files
-			echo "This node is reported to run in the future, configuring APT to ignore the Release file expiration..."
-			DEBOOTSTRAP+=(--aptopt='Acquire::Check-Valid-Until "false"')
-		fi
-	else
-		DEBOOTSTRAP+=(debootstrap)
-		# configure dpkg to be faster (mmdebstrap expects an empty directory and is fast by design)
-		mkdir -p "$SCHROOT_TARGET/etc/dpkg/dpkg.cfg.d"
-		echo force-unsafe-io > "$SCHROOT_TARGET/etc/dpkg/dpkg.cfg.d/02dpkg-unsafe-io"
-		if "$NODE_RUN_IN_THE_FUTURE" ; then
-			# configure apt to ignore expired release files
-			echo "This node is reported to run in the future, configuring APT to ignore the Release file expiration..."
-			mkdir -p "$SCHROOT_TARGET/etc/apt/apt.conf.d/"
-			echo 'Acquire::Check-Valid-Until "false";' | sudo tee -a "$SCHROOT_TARGET"/etc/apt/apt.conf.d/398future >/dev/null
-		fi
-
+	DEBOOTSTRAP+=(mmdebstrap)
+	if "$NODE_RUN_IN_THE_FUTURE" ; then
+		# configure apt to ignore expired release files
+		echo "This node is reported to run in the future, configuring APT to ignore the Release file expiration..."
+		DEBOOTSTRAP+=(--aptopt='Acquire::Check-Valid-Until "false"')
 	fi
 	set -x
 	sudo -- "${DEBOOTSTRAP[@]}" "$SUITE" "$SCHROOT_TARGET" "$MIRROR" | tee "$TMPLOG"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/660c0017c5885d6ee0ef05905b4dab8c06539bae

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/660c0017c5885d6ee0ef05905b4dab8c06539bae
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20220914/caccac66/attachment-0001.htm>