update nano-lava location

nano-lava image was moved. While at it, switch to xz compressed images.

5 files changed, 10 insertions, 10 deletions

diff --git a/configs/arndale.template b/configs/arndale.template
index 4c38dcd..aeb732a 100644
--- a/configs/arndale.template
+++ b/configs/arndale.template
@@ -1,7 +1,7 @@
 export toolchain_url=http://releases.linaro.org/14.08/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.08_linux.tar.xz
-export git_url=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-export git_branch=linux-3.17.y
-export kernel_config=exynos_defconfig
+export git_url=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+export git_branch=master
+export kernel_config=multi_v7_defconfig
 export kernel_extra_frag=xen.config
 export ARCH=arm
 export MAKE_DTBS="true"
diff --git a/lava/scripts/test-guest.sh b/lava/scripts/test-guest.sh
index b58f0c9..7065509 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/707/vexpress-utopic_nano_20150117-707.img.gz
-        BACKUP_FILENAME=vexpress-utopic_nano_20150117-707.img
+        BACKUP_URL=https://snapshots.linaro.org/ubuntu/pre-built/vexpress/713/vexpress-utopic_nano_20150220-713.img.gz
+        BACKUP_FILENAME=vexpress-utopic_nano_20150220-713.img.gz
         ;;
     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/lava/xen-arndale.json b/lava/xen-arndale.json
index b57e5a2..b4980e4 100644
--- a/lava/xen-arndale.json
+++ b/lava/xen-arndale.json
@@ -8,7 +8,7 @@
           "hwpack.type" : "xen-arndale"
       },
       "parameters": {
-        "image": "http://snapshots.linaro.org/ubuntu/images/xen/latest/xenlava-arndale.img.gz",
+        "image": "http://snapshots.linaro.org/ubuntu/images/xen/latest/xenlava-arndale.img.xz",
 	"bootloadertype": "u_boot"
       }
     },
diff --git a/lava/xen-midway.json b/lava/xen-midway.json
index d11bddb..36b0ad7 100644
--- a/lava/xen-midway.json
+++ b/lava/xen-midway.json
@@ -9,7 +9,7 @@
                 "ubuntu.name": "midway"
             },
             "parameters": {
-                "image": "http://snapshots.linaro.org/ubuntu/images/xen/latest/xenlava-midway.img.gz"
+                "image": "http://snapshots.linaro.org/ubuntu/images/xen/latest/xenlava-midway.img.xz"
             }
         },
         {
diff --git a/makelavaimg b/makelavaimg
index 74032d6..02de54d 100755
--- a/makelavaimg
+++ b/makelavaimg
@@ -10,7 +10,7 @@ set -e
 
 sudo dpkg --add-architecture i386
 sudo apt-get update
-sudo apt-get install --no-install-recommends -y kpartx u-boot-tools wget linaro-image-tools parted curl gdisk libc6:i386 libstdc++6:i386 zlib1g:i386 bc build-essential qemu-user-static linaro-image-tools python-pycurl python-beautifulsoup python-html2text python-xdg python-debian
+sudo apt-get install --no-install-recommends -y kpartx u-boot-tools wget linaro-image-tools parted curl gdisk libc6:i386 libstdc++6:i386 zlib1g:i386 bc build-essential qemu-user-static linaro-image-tools python-pycurl python-beautifulsoup python-html2text python-xdg python-debian pixz
 
 if [ -n "$1" -a -n "$2" ]; then 
  export hwpack="$1"
@@ -74,7 +74,7 @@ set -e
 export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-rootfs/label=build,rootfs=nano-lava/lastSuccessfulBuild/buildNumber`
 export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-rootfs/label=build,rootfs=nano-lava/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
 export ROOTFS_BUILD_FILENAME="linaro-${suite}-nano-lava-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-export ROOTFS_BUILD_URL="http://snapshots.linaro.org/ubuntu/images/nano-lava/${ROOTFS_BUILD_NUMBER}/${ROOTFS_BUILD_FILENAME}"
+export ROOTFS_BUILD_URL="http://snapshots.linaro.org/ubuntu/images/nano-lava-armhf/${ROOTFS_BUILD_NUMBER}/${ROOTFS_BUILD_FILENAME}"
 wget -N --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
 if [ $? -ne 0 ]; then
     echo "rootfs download failed"
@@ -164,4 +164,4 @@ sudo umount $BOOTMOUNT
 sudo kpartx -d ${image}
 
 #compress the image
-gzip -9 ${image}
+time pixz ${image}