[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: update_jdn: do not explicitly mention stretch-backports: the...

[Mattia Rizzolo]

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


Commits:
54b83328 by Mattia Rizzolo at 2021-01-22T02:03:19+01:00
update_jdn: do not explicitly mention stretch-backports: the apt_preferences(5) file should be enough

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

- - - - -
09cc555f by Mattia Rizzolo at 2021-01-22T02:03:28+01:00
also use apt_preferences(5) to install the newer debootstrap in the ubuntu nodes

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

- - - - -


2 changed files:

- hosts/common-arm64/etc/apt/preferences.d/pbuilder
- update_jdn.sh


Changes:

=====================================
hosts/common-arm64/etc/apt/preferences.d/pbuilder
=====================================
@@ -6,6 +6,12 @@ Package: munin-node munin-plugins-core munin-plugins-extra munin-common
 Pin: release o=Debian Backports
 Pin-Priority: 990
 
+# install a newer debootstrap as since 20180927 debootstrap 1.0.78+nmu1ubuntu1.6 cannot install sid anymore
+# also, pbuilder requires debootstrap >= 1.0.97
+Package: debootstrap
+Pin: release o=Debian Backports
+Pin-Priority: 990
+
 Package: *
 Pin: release o=Debian Backports
 Pin-Priority: -1


=====================================
update_jdn.sh
=====================================
@@ -323,14 +323,9 @@ if [ -f /etc/debian_version ] ; then
 			"
 		case $HOSTNAME in
 			codethink*)
-				# install debootstrap from stretch-backports on ubuntu nodes as since 20180927 debootstrap 1.0.78+nmu1ubuntu1.6 cannot install sid anymore
-				DEBS="$DEBS
-				debootstrap/stretch-backports
-				munin-node/stretch-backports
-				munin-plugins-core/stretch-backports
-				munin-plugins-extra/stretch-backports
-				pbuilder/stretch-backports
-				" ;;
+				# the apt_preferences(5) file will cause some packages to come
+				# from Debian backports
+				;
 			*)	# not available in Ubuntu 16.04:
 				DEBS="$DEBS
 				ripgrep



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/71b6b33a42b4b6c29b8f6341acf20329d001faf9...09cc555fc6563df05e553c256370bbc8f93bdfd7

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/71b6b33a42b4b6c29b8f6341acf20329d001faf9...09cc555fc6563df05e553c256370bbc8f93bdfd7
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/20210122/71a10daf/attachment-0001.html>