summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2014-08-28 11:26:59 +0300
committerRiku Voipio <riku.voipio@linaro.org>2014-08-28 11:26:59 +0300
commitdba4cea85dd69a5da620fcb6ab59cc6730c9b201 (patch)
tree0b9d2e2390ca232f3e58528941f68b4afb244035
parentd772b9224e4b35e418dcdefbadd6cf111d74661a (diff)
downloadxen-ci-dba4cea85dd69a5da620fcb6ab59cc6730c9b201.tar.gz
error out on image failure and update backup url
-rwxr-xr-xlava/scripts/test-guest.sh4
-rwxr-xr-xmakelavaimg2
2 files changed, 4 insertions, 2 deletions
diff --git a/lava/scripts/test-guest.sh b/lava/scripts/test-guest.sh
index 5571ea7..d6a46a7 100755
--- a/lava/scripts/test-guest.sh
+++ b/lava/scripts/test-guest.sh
@@ -44,8 +44,8 @@ case `uname -m` in
ROOTFS_BUILD_DATE=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=vexpress,label=build/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
ROOTFS_BUILD_FILENAME="vexpress-${ROOTFS_BUILD_SUITE}_nano_$ROOTFS_BUILD_DATE-$ROOTFS_BUILD_NUMBER.img"
ROOTFS_BUILD_URL="https://snapshots.linaro.org/ubuntu/pre-built/vexpress/$ROOTFS_BUILD_NUMBER/$ROOTFS_BUILD_FILENAME.gz"
- BACKUP_URL=https://snapshots.linaro.org/ubuntu/pre-built/vexpress/682/vexpress-trusty_nano_20140727-682.img.gz
- BACKUP_FILENAME=vexpress-trusty_nano_20140727-682.img
+ BACKUP_URL=https://snapshots.linaro.org/ubuntu/pre-built/vexpress/686/vexpress-trusty_nano_20140823-686.img.gz
+ BACKUP_FILENAME=vexpress-trusty_nano_20140823-686.img
;;
aarch64)
ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-arm64-rootfs/label=build,rootfs=nano/lastSuccessfulBuild/buildNumber`
diff --git a/makelavaimg b/makelavaimg
index b9c655d..c2b2c20 100755
--- a/makelavaimg
+++ b/makelavaimg
@@ -6,6 +6,8 @@
#wget -N http://releases.linaro.org/13.08/ubuntu/${suite}-images/nano/linaro-${suite}-nano-20130826-474.tar.gz
#wget -N http://snapshots.linaro.org/components/platform/xen/latest/xen
+set -e
+
if [ -n "$1" -a -n "$2" ]; then
export hwpack="$1"
export FILES="$2"