reproducible Debian: upgraded jenkins and pb10 to stretch (=all debian nodes), some work left to do

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

4 files changed, 55 insertions, 32 deletions

diff --git a/TODO4stretch-host-upgrades.txt b/TODO4stretch-host-upgrades.txt
index ef8c0ee7..f2a1e5b0 100644
--- a/TODO4stretch-host-upgrades.txt
+++ b/TODO4stretch-host-upgrades.txt
@@ -1,4 +1,35 @@
+things to look at on jenkins.d.n. after the upgrade
+---------------------------------------------------
+Configuration file '/etc/default/shorewall'
+Configuration file '/etc/shorewall/shorewall.conf'
+Configuration file '/etc/shorewall6/shorewall6.conf'
+Configuration file '/etc/calamaris/calamaris.conf'
+Configuration file '/etc/apache2/conf-available/security.conf'
 
+   │ Obsolete major version 9.4                                                                         
+   │                                                                                                    
+   │ The PostgreSQL version 9.4 is obsolete, but the server or client packages are still installed.     
+   │ Please install the latest packages (postgresql-9.6 and postgresql-client-9.6) and upgrade the      
+   │ existing  clusters with pg_upgradecluster (see manpage).                                           
+   │                                                                                                    
+  │ Please be aware that the installation of postgresql-9.6 will automatically create a default        
+   │ cluster 9.6/main. If you want to upgrade the 9.4/main cluster, you need to remove the already      
+   │ existing 9.6 cluster (pg_dropcluster --stop 9.6 main, see manpage for details).                    
+   │                                                                                                    
+   │ The old server and client packages are no longer supported. After the existing clusters are        
+   │ upgraded, the postgresql-9.4 and postgresql-client-9.4 packages should be removed.    
+
+   │ Please see /usr/share/doc/postgresql-common/README.Debian.gz for details.                          
+
+-> didnt cleanup installed packages on jenkins just yet
+
+pb10
+----
+had to apt install linux-image-amd64 should go in update_jdn and why is that even neccessary?
+
+update_jdn.sh
+-------------
+refactor some apt-get install calls away (which used to be needed because of jessie-backports…)
 
 
 open problems
@@ -15,11 +46,6 @@ because of:
 amd64 kernel was manually installed with multiarch, should go into update_jdn
 also on pb3+4+9 I had to do: sudo apt install linux-image-amd64
 
-todo for upgrades
------------------
-test jenkins-test-vm upgrade before doing jenkins
-	-> cucumber problems reported by fil
-
 
 to be done once all hosts run stretch: squid
 --------------------------------------------
@@ -37,5 +63,4 @@ to be done once all hosts run stretch: sshd_config
 
 done for upgrades
 -----------------
-all i386+armhf nodes
-all amd64 nodes except jenkins and am64
+all i386+armhf+amd64 nodes
diff --git a/hosts/jenkins/etc/apt/sources.list b/hosts/jenkins/etc/apt/sources.list
index a9a65f71..a7311f2e 100644
--- a/hosts/jenkins/etc/apt/sources.list
+++ b/hosts/jenkins/etc/apt/sources.list
@@ -1,12 +1,12 @@
-deb http://deb.debian.org/debian/ jessie main contrib non-free
-#deb-src http://deb.debian.org/debian/ jessie main contrib non-free
+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/ jessie-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ jessie-updates 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://security.debian.org/ jessie/updates main contrib non-free
-#deb-src http://security.debian.org/ jessie/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://deb.debian.org/debian/ jessie-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ jessie-backports 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
 
diff --git a/hosts/profitbricks-build10-amd64/etc/apt/sources.list b/hosts/profitbricks-build10-amd64/etc/apt/sources.list
index a9a65f71..a7311f2e 100644
--- a/hosts/profitbricks-build10-amd64/etc/apt/sources.list
+++ b/hosts/profitbricks-build10-amd64/etc/apt/sources.list
@@ -1,12 +1,12 @@
-deb http://deb.debian.org/debian/ jessie main contrib non-free
-#deb-src http://deb.debian.org/debian/ jessie main contrib non-free
+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/ jessie-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ jessie-updates 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://security.debian.org/ jessie/updates main contrib non-free
-#deb-src http://security.debian.org/ jessie/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://deb.debian.org/debian/ jessie-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ jessie-backports 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
 
diff --git a/update_jdn.sh b/update_jdn.sh
index f8b4ac96..0aa59b45 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -521,8 +521,7 @@ if [ -f /etc/debian_version ] ; then
 			case $HOSTNAME in
 				codethink*) 	$UP2DATE || sudo apt-get install -t jessie-backports pbuilder
 						;;
-				*)		$UP2DATE || sudo apt-get install -t jessie-backports \
-							pbuilder lintian || echo "this should only fail on the first install"
+				*)		$UP2DATE || sudo apt-get install pbuilder lintian
 				;;
 			esac
 		fi
@@ -530,24 +529,23 @@ if [ -f /etc/debian_version ] ; then
 		if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' unattended-upgrades 2>/dev/null || true)" = "ii "  ] ; then
 			 sudo apt-get -y purge unattended-upgrades
 		fi
-		# we need mock from bpo to build current fedora
+		# we need mock to build fedora
 		if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
-			$UP2DATE || sudo apt-get install -t jessie-backports mock \
-				|| echo "this should only fail on the first install"
+			$UP2DATE || sudo apt-get install mock
 		fi
 		# for varying kernels:
 		# - we use bpo kernels on pb-build5+15 (and the default i386 kernel on pb-build2+12-i386)
 		# - we use the default amd64 kernel on pb-build1+11 (and the default amd64 kernel on pb-build6+16-i386)
 		if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build15-amd64" ] ; then
-			$UP2DATE || sudo apt-get install -t jessie-backports linux-image-amd64 || echo "this should only fail on the first install"
+			$UP2DATE || sudo apt-get install linux-image-amd64
 		elif [ "$HOSTNAME" = "profitbricks-build6-i386" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then
 			$UP2DATE || sudo apt-get install linux-image-amd64
 		fi
-		# only needed on the main node
+		# only needed on the main nodes # FIXME this is redundant
 		if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
-			$UP2DATE || sudo apt-get install -t jessie-backports jenkins-job-builder || echo "this should only fail on the first install"
+			$UP2DATE || sudo apt-get install jenkins-job-builder
 		elif [ "$HOSTNAME" = "jenkins" ] ; then
-			$UP2DATE || sudo apt-get install -t jessie-backports ffmpeg libav-tools python3-popcon jenkins-job-builder dose-extra
+			$UP2DATE || sudo apt-get install ffmpeg libav-tools python3-popcon jenkins-job-builder dose-extra
 		fi
 		explain "packages installed."
 	else