[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: switch jenkins and all armhf nodes to Buster

Holger Levsen gitlab at salsa.debian.org
Sun Aug 11 17:32:42 BST 2019



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


Commits:
7fef98af by Holger Levsen at 2019-08-11T16:30:47Z
reproducible: switch jenkins and all armhf nodes to Buster

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

- - - - -


22 changed files:

- TODO
- hosts/common/etc/apt/sources.list
- − hosts/osuosl-build167-amd64/etc/apt/sources.list
- − hosts/osuosl-build168-amd64/etc/apt/sources.list
- − hosts/osuosl-build169-amd64/etc/apt/sources.list
- − hosts/osuosl-build170-amd64/etc/apt/sources.list
- − hosts/osuosl-build171-amd64/etc/apt/sources.list
- − hosts/osuosl-build172-amd64/etc/apt/sources.list
- − hosts/osuosl-build173-amd64/etc/apt/sources.list
- − hosts/osuosl-build174-amd64/etc/apt/sources.list
- − hosts/profitbricks-build1-amd64/etc/apt/sources.list
- − hosts/profitbricks-build10-amd64/etc/apt/sources.list
- − hosts/profitbricks-build11-amd64/etc/apt/sources.list
- − hosts/profitbricks-build12-i386/etc/apt/sources.list
- − hosts/profitbricks-build15-amd64/etc/apt/sources.list
- − hosts/profitbricks-build16-i386/etc/apt/sources.list
- − hosts/profitbricks-build2-i386/etc/apt/sources.list
- − hosts/profitbricks-build5-amd64/etc/apt/sources.list
- − hosts/profitbricks-build6-i386/etc/apt/sources.list
- − hosts/profitbricks-build7-amd64/etc/apt/sources.list
- − hosts/profitbricks-build9-amd64/etc/apt/sources.list
- update_jdn.sh


Changes:

=====================================
TODO
=====================================
@@ -108,10 +108,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 * import data on jenkins
 * schedule/trigger rebuilds on osuosl173, put data in sqlite on pb7
 
-=== upgrades to buster
-
-* only done on some nodes yet. 
-** so we can drop hosts/osuosl-build174-amd64/etc/apt/sources.list once hosts/common/... has buster
 
 ==== proper backup
 


=====================================
hosts/common/etc/apt/sources.list
=====================================
@@ -1,11 +1,11 @@
-deb http://deb.debian.org/debian/ stretch main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch main contrib non-free
+deb http://deb.debian.org/debian/ buster main contrib non-free
+#deb-src http://deb.debian.org/debian/ buster main contrib non-free
 
-deb http://deb.debian.org/debian/ stretch-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-updates main contrib non-free
+deb http://deb.debian.org/debian/ buster-updates main contrib non-free
+#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
 
-deb http://security.debian.org/ stretch/updates main contrib non-free
-#deb-src http://security.debian.org/ stretch/updates main contrib non-free
+deb http://security.debian.org/ buster/updates main contrib non-free
+#deb-src http://security.debian.org/ buster/updates main contrib non-free
 
-deb http://deb.debian.org/debian/ stretch-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-backports main contrib non-free
+deb http://deb.debian.org/debian/ buster-backports main contrib non-free
+#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build167-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build168-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build169-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build170-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build171-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build172-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build173-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/osuosl-build174-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build1-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build10-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build11-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build12-i386/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build15-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build16-i386/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build2-i386/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build5-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build6-i386/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build7-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
hosts/profitbricks-build9-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,11 +0,0 @@
-deb http://deb.debian.org/debian/ buster main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
-
-deb http://security.debian.org/ buster/updates main contrib non-free
-#deb-src http://security.debian.org/ buster/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ buster-backports main contrib non-free


=====================================
update_jdn.sh
=====================================
@@ -281,15 +281,9 @@ if [ -f /etc/debian_version ] ; then
 			zsh
 			"
 		case $HOSTNAME in
-			# running buster already
-			osuosl*|profitbricks*) DEBS="$DEBS
-				debootstrap
-				munin-node
-				munin-plugins-core
-				munin-plugins-extra
-				pbuilder
-				" ;;
-			*) DEBS="$DEBS
+			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
@@ -319,12 +313,6 @@ if [ -f /etc/debian_version ] ; then
 				python3-yaml" ;;
 			*) ;;
 		esac
-		# install debootstrap from stretch-backports on ubuntu nodes as since 20180927 debootstrap 1.0.78+nmu1ubuntu1.6 cannot install sid anymore
-		case $HOSTNAME in
-			codethink*) DEBS="$DEBS
-				debootstrap/stretch-backports" ;;
-			*) 	;;
-		esac
 		# needed to run the 2nd reproducible builds nodes in the future...
 		case $HOSTNAME in
 			profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) DEBS="$DEBS ntpdate" ;;
@@ -428,7 +416,7 @@ if [ -f /etc/debian_version ] ; then
 				imagemagick 
 				ip2host
 				jekyll
-				jenkins-job-builder/stretch-backports
+				jenkins-job-builder
 				jq
 				kgb-client
 				libcap2-bin 
@@ -440,7 +428,7 @@ if [ -f /etc/debian_version ] ; then
 				moreutils 
 				mr 
 				mtr-tiny 
-				munin/stretch-backports
+				munin
 				ntp 
 				obfs4proxy
 				openbios-ppc 
@@ -479,7 +467,7 @@ if [ -f /etc/debian_version ] ; then
 				shorewall6 
 				sqlite3 
 				syslinux
-				systemd/stretch-backports
+				systemd
 				thin-provisioning-tools
 				tor
 				vncsnapshot 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/7fef98af14c30c73590e07397f7c5fa09286b780

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/7fef98af14c30c73590e07397f7c5fa09286b780
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/20190811/6fcdc3c5/attachment-0001.html>


More information about the Qa-jenkins-scm mailing list