[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: adjust code and comments for installing kernels to reality

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit fc4d99b056fa44bf9e2eab0d789c13c9d0c401c4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Mar 9 11:18:56 2017 +0100

    reproducible Debian: adjust code and comments for installing kernels to reality
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 update_jdn.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/update_jdn.sh b/update_jdn.sh
index 7483a95..b8eaa00 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -498,11 +498,13 @@ if [ -f /etc/debian_version ] ; then
 			$UP2DATE || sudo apt-get install -t jessie-backports mock \
 				|| echo "this should only fail on the first install"
 		fi
-		# for varying kernels
-		# we use bpo kernels on pb-build5+6+15+16 (and the default i386 kernel on pb-build2+12-i386)
-		if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \
-		   [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] ; then
+		# 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"
+		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
 		if [ "$HOSTNAME" = "jenkins-test-vm" ] ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git