[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: workaround diffoscope not being installable in testing

[Holger Levsen]

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


Commits:
e6c13507 by Holger Levsen at 2020-08-23T18:15:06+02:00
reproducible: workaround diffoscope not being installable in testing

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

- - - - -


1 changed file:

- bin/schroot-create.sh


Changes:

=====================================
bin/schroot-create.sh
=====================================
@@ -184,7 +184,7 @@ bootstrap() {
 			# we could also use $SCRIPT_HEADER (set in bin/common-functions.sh) in our generated scripts
 			# instead of using the next line, maybe we should…
 			echo 'debconf debconf/frontend select noninteractive' | sudo chroot $SCHROOT_TARGET debconf-set-selections
-			robust_chroot_apt install -y --install-recommends diffoscope
+			robust_chroot_apt install -y --install-recommends diffoscope || true # || true is a workaround for diffoscope not in testing
 		fi
 		robust_chroot_apt install -y --no-install-recommends sudo
 		robust_chroot_apt install -y --no-install-recommends $@
@@ -193,8 +193,14 @@ bootstrap() {
 			# always try to use diffoscope from unstable on stretch/buster
 			echo "deb $MIRROR unstable main" | sudo tee -a $SCHROOT_TARGET/etc/apt/sources.list > /dev/null
 			robust_chroot_apt update
-			# install diffoscope from unstable without re-adding all recommends....
-			sudo chroot $SCHROOT_TARGET apt-get install -y -t unstable --no-install-recommends diffoscope || echo "Warning: diffoscope from unstable is uninstallable at the moment."
+			if [ "$SUITE" = "bullseye" ] ; then
+				# workaround diffoscope not in testing:
+				# install diffoscope from unstablle with recommends
+				sudo chroot $SCHROOT_TARGET apt-get install -y -t unstable diffoscope
+			else
+				# install diffoscope from unstable without re-adding all recommends...
+				sudo chroot $SCHROOT_TARGET apt-get install -y -t unstable --no-install-recommends diffoscope || echo "Warning: diffoscope from unstable is uninstallable at the moment."
+			fi
 		fi
 		if [ "$SUITE" != "experimental" ] && [ "$1" = "diffoscope" ] ; then
 			echo "deb $MIRROR experimental main" | sudo tee -a $SCHROOT_TARGET/etc/apt/sources.list > /dev/null



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e6c13507cdbd8915f5310c474c12c3596888e633
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/20200823/5b14bdc4/attachment-0001.html>