summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-03-09 11:18:56 +0100
committerHolger Levsen <holger@layer-acht.org>2017-03-09 11:18:56 +0100
commitfc4d99b056fa44bf9e2eab0d789c13c9d0c401c4 (patch)
treece7843e77e4a556a743150e9921f592e75f8a0c2
parent342255318293f9217256ce4a69a04631a723ec87 (diff)
downloadjenkins.debian.net-fc4d99b056fa44bf9e2eab0d789c13c9d0c401c4.tar.xz
reproducible Debian: adjust code and comments for installing kernels to reality
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xupdate_jdn.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 7483a95e..b8eaa007 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