[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: pbuilder: DRY the MIRRORSITE configuration, now that is the same for everything

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
d86fdb4d by Mattia Rizzolo at 2019-01-22T05:16:07Z
pbuilder: DRY the MIRRORSITE configuration, now that is the same for everything

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
0b7d2b9f by Mattia Rizzolo at 2019-01-22T05:16:23Z
pbuilder: simplify the seection for i386/armhf hosts

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
cf6c8577 by Mattia Rizzolo at 2019-01-22T05:17:03Z
pbuilder: use the apt dependency resolver

this is because aptitude is slower, and pulls in many packages as
dependencies (boost, etc), so it is also a hog during chroot creation.

nowdays the apt one should be good to go for everything that is not
backports, that we aren't testing anyway.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- hosts/common/etc/pbuilderrc


Changes:

=====================================
hosts/common/etc/pbuilderrc
=====================================
@@ -6,22 +6,10 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in
-	jenkins|jenkins-test-vm|profitbricks-build*|osuosl*)
-			MIRRORSITE=http://deb.debian.org/debian ;;
-	bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*)
-
-			MIRRORSITE=http://deb.debian.org/debian ;;
-	codethink*)
-			MIRRORSITE=http://deb.debian.org/debian ;;
-	*)
-			echo "unsupported host, exiting." ; exit 1 ;;
-esac
+MIRRORSITE="http://deb.debian.org/debian"
 # only use eatmydata on armhf+i386 - on amd64+arm64 we build in tmpfs anyway
 case $HOSTNAME in
-	profitbricks-build*i386)
-		EATMYDATA=yes ;;
-	bbx15|cb3*|cbxi4*|wbq0|odxu4*|odu3*|odc*|ff*|ff4*|opi2*|jt?1*|p64*)
+	*i386*|*armhf*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
@@ -30,6 +18,9 @@ APTCACHE=""
 COMPRESSPROG="pigz"
 BUILDPLACE=/srv/workspace/pbuilder  # build in /srv/workspace, which is in tmpfs
 
+# dependency resolver to use - the default aptitude one has many dependencies
+PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
+
 # set PATH to predictable values, see #780729 and #780725
 PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/2ddfd5b9fe77d09d4ff1ee69143d1f9a009b6f94...cf6c85775ff9955035aeba616d6d1aacfeb5d2af

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/2ddfd5b9fe77d09d4ff1ee69143d1f9a009b6f94...cf6c85775ff9955035aeba616d6d1aacfeb5d2af
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/20190122/67592c6c/attachment-0001.html>