[Qa-jenkins-scm] [jenkins.debian.net] 03/03: lvc: download ISO before checking the snapshots

[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 8bcbe2dbe30be64b995d920144dd28493fb1a163
Author: Philip Hands <phil at hands.com>
Date:   Sun Jun 5 21:16:12 2016 +0200

    lvc: download ISO before checking the snapshots
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/lvc.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/lvc.sh b/bin/lvc.sh
index 11de268..80163b0 100755
--- a/bin/lvc.sh
+++ b/bin/lvc.sh
@@ -68,13 +68,6 @@ mkdir -p $RESULTS
 
 mkdir -p $WORKSPACE/DebianToasterStorage
 
-for dep in /srv/jenkins/cucumber /srv/jenkins/bin/lvc.sh /srv/jenkins/job-cfg/lvc.yaml $NETBOOT ; do
-  if [ -e "$dep" ] ; then
-    LV_SNAP_DEPENDS="$LV_SNAP_DEPENDS $dep"
-  fi
-done
-discard_snapshots $LIBVIRT_DOMAIN_NAME $LV_SNAP_DEPENDS
-
 trap cleanup_all INT TERM EXIT
 
 #
@@ -124,6 +117,14 @@ else
         fetch_if_newer "$INITRD" "$URL/$INITRD"
 fi
 
+# discard any snapshots that are older than the inputs
+for dep in /srv/jenkins/cucumber /srv/jenkins/bin/lvc.sh /srv/jenkins/job-cfg/lvc.yaml $NETBOOT ; do
+  if [ -e "$dep" ] ; then
+    LV_SNAP_DEPENDS="$LV_SNAP_DEPENDS $dep"
+  fi
+done
+discard_snapshots $LIBVIRT_DOMAIN_NAME $LV_SNAP_DEPENDS
+
 #  --keep-snapshots -- keeps the VM snapshots -- let's make life simple and not do that until we're using them to pass on state to the next jenkins job
 
 echo "Debug log available at runtime at https://jenkins.debian.net/view/lvc/job/$JOB_NAME/ws/results/debug.log"

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