From 126d0ad5bc4d06a491d43fa60460193c13d4c470 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Tue, 17 Jan 2017 17:42:37 +0100
Subject: [PATCH] release-testing: Use "set -e" instead of "|| break"

---
 NEWS.markdown            | 1 +
 debian/changelog         | 2 +-
 examples/release-testing | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS.markdown b/NEWS.markdown
index 9306142..7899693 100644
--- a/NEWS.markdown
+++ b/NEWS.markdown
@@ -45,6 +45,7 @@ Test Suite
 * release-testing:
   + Use per-test-unique host names. Avoids race conditions with
     immediately re-used LVs.
+  + Use "set -e" instead of "|| break".
 
 
 xen-tools 4.6.2 (released 23 Dec 2015)
diff --git a/debian/changelog b/debian/changelog
index 8816765..d1742a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 xen-tools (4.6.3~dev-1) UNRELEASED; urgency=medium
 
   * New upstream development release
-    + release-testing: Work around umount race condition between tests.
+    + release-testing: Several enhancements, race condition avoidance, …
     + Fixes reported error code in case of subcommand failure (Reported
       and fixed by Yuri Sakhno, thanks!)
     + Fixes typo found by lintian.
diff --git a/examples/release-testing b/examples/release-testing
index 41a3f79..e96447f 100755
--- a/examples/release-testing
+++ b/examples/release-testing
@@ -1,6 +1,8 @@
 #!/bin/sh
 
+set -e
+
 # Skip dapper and edgy due to bug #659360 in debootstrap
 for dist in $(awk '!/^#|^$/ {print $1}' /etc/xen-tools/distributions.conf | egrep -v '^(dapper|edgy|buster|bullseye)$'); do
-    xen-create-image --dist $dist --hostname "xen-tools-release-testing-$dist" --force --verbose "$@" || break
+    xen-create-image --dist $dist --hostname "xen-tools-release-testing-$dist" --force --verbose "$@"
 done 2>&1 | tee xen-tools-release-testing.log