[tor-commits] [tor-browser-bundle/maint-7.0] Bug 22479: create jessie amd64 VM in make-vms.sh

[gk at torproject.org]

commit 1bf37e1a096c6fe12cba1a26a4ac7dd800722ad2
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Sat Jun 3 11:16:17 2017 +0200

    Bug 22479: create jessie amd64 VM in make-vms.sh
---
 gitian/make-vms.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh
index f47deca..b5e4be2 100755
--- a/gitian/make-vms.sh
+++ b/gitian/make-vms.sh
@@ -32,7 +32,7 @@ build_and_test_vm() {
     then
       export LXC_SUITE=$dist
       export LXC_ARCH=$arch
-      if [ "$dist" = "wheezy" ];
+      if [ "$dist" = "wheezy" -o "$dist" = "jessie" ];
       then
         export DISTRO=debian
         ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch
@@ -41,7 +41,7 @@ build_and_test_vm() {
         ./bin/make-base-vm --suite $dist --lxc --arch $arch
       fi
     else
-      if [ "$dist" = "wheezy" ];
+      if [ "$dist" = "wheezy" -o "$dist" = "jessie" ];
       then
         export DISTRO=debian
         ./bin/make-base-vm --distro debian --suite $dist --arch $arch
@@ -89,6 +89,15 @@ do
   echo
 done
 
+while ! build_and_test_vm jessie amd64 64
+do
+  stop-target 64 jessie
+  rm ./base-jessie-amd64*
+  echo
+  echo "Jessie amd64 VM build failed... Trying again"
+  echo
+done
+
 while ! build_and_test_vm precise i386 32
 do
   stop-target 32 precise