From b2d7bc92c226b96ac432a68858e7d84947193963 Mon Sep 17 00:00:00 2001
From: Igor Kalnitsky <igor@kalnitsky.org>
Date: Wed, 3 Jun 2015 14:43:09 +0300
Subject: [PATCH] Download debian netboot installer each time

Currently if debian netboot installer is already downloaded we skip
downloading and start provisioning. It's an error-prone approach
because the installer may stuck if its kernel version mismatch
archive's kernel version. This patch starts to download debian
installer each time we start provisioning.

Closes-Bug: #1461206

Change-Id: Ia6b8653461e604ae05f306406e8a3515a593fc53
Signed-off-by: Igor Kalnitsky <igor@kalnitsky.org>
---
 bin/download-debian-installer | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/bin/download-debian-installer b/bin/download-debian-installer
index 7f553b951a..4e451b5b5b 100755
--- a/bin/download-debian-installer
+++ b/bin/download-debian-installer
@@ -51,22 +51,13 @@ REMOTE_INITRD_URI=$2
 LOCAL_KERNEL_FILE=${LOCAL_KERNEL_FILE:-/var/www/nailgun/ubuntu/x86_64/images/linux}
 LOCAL_INITRD_FILE=${LOCAL_INITRD_FILE:-/var/www/nailgun/ubuntu/x86_64/images/initrd.gz}
 
+log "Trying to download $REMOTE_KERNEL_URI"
+mkdir -p `dirname $LOCAL_KERNEL_FILE`
+wget -O - -T 120 -a $LOG_FILE -v $REMOTE_KERNEL_URI > $LOCAL_KERNEL_FILE.tmp
 
-log "Checking if any of $LOCAL_KERNEL_FILE and $LOCAL_INITRD_FILE need to be downloaded"
-if ! test -s $LOCAL_KERNEL_FILE -a -s $LOCAL_INITRD_FILE; then
-    log "Looks like at least of of files is zero size"
+log "Trying to download $REMOTE_INITRD_URI"
+mkdir -p `dirname $LOCAL_INITRD_FILE`
+wget -O - -T 120 -a $LOG_FILE -v $REMOTE_INITRD_URI > $LOCAL_INITRD_FILE.tmp
 
-    log "Trying to download $REMOTE_KERNEL_URI"
-    mkdir -p `dirname $LOCAL_KERNEL_FILE`
-    wget -O - -T 120 -a $LOG_FILE -v $REMOTE_KERNEL_URI > $LOCAL_KERNEL_FILE.tmp
-
-    log "Trying to download $REMOTE_INITRD_URI"
-    mkdir -p `dirname $LOCAL_INITRD_FILE`
-    wget -O - -T 120 -a $LOG_FILE -v $REMOTE_INITRD_URI > $LOCAL_INITRD_FILE.tmp
-
-    mv $LOCAL_KERNEL_FILE.tmp $LOCAL_KERNEL_FILE
-    mv $LOCAL_INITRD_FILE.tmp $LOCAL_INITRD_FILE
-else
-    log "Looks like both files $LOCAL_KERNEL_FILE and $LOCAL_INITRD_FILE are available"
-    log "Nothing needs to be done"
-fi
+mv $LOCAL_KERNEL_FILE.tmp $LOCAL_KERNEL_FILE
+mv $LOCAL_INITRD_FILE.tmp $LOCAL_INITRD_FILE