From 830858a161a9956a6342fcd7e233d02a7e7268e6 Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Thu, 22 Mar 2018 10:49:27 +0200
Subject: [PATCH] Fix build VM restore process

Moving 'mdbci destroy' bofere creating build.json to prevent
build.json from being deleted by 'destroy' command.
---
 BUILD/mdbci/build.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/BUILD/mdbci/build.sh b/BUILD/mdbci/build.sh
index a18c16f92..cbeb7d992 100755
--- a/BUILD/mdbci/build.sh
+++ b/BUILD/mdbci/build.sh
@@ -52,6 +52,12 @@ if [ "${try_already_running}" == "yes" ]; then
 fi
 
 if [ "$already_running" != "ok" ]; then
+	# destroying existing box
+	if [ -d "$MDBCI_VM_PATH/${name}" ]; then
+		${mdbci_dir}/mdbci destroy $name
+	fi
+        # Just in case some old lock file left
+        rm -rf ${snapshot_lock_file}
 
   eval "cat <<EOF
 $(<${script_dir}/templates/build.json.template)
@@ -64,11 +70,6 @@ $(<${script_dir}/templates/build.json.template)
 	touch ~/vagrant_lock
 	echo $JOB_NAME-$BUILD_NUMBER >> ~/vagrant_lock
 
-	# destroying existing box
-	if [ -d "$MDBCI_VM_PATH/${name}" ]; then
-		${mdbci_dir}/mdbci destroy $name
-	fi
-
 	# starting VM for build
 	echo "Generating build VM template"
 	${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name
@@ -104,14 +105,11 @@ if [ $? -eq 0 ] ; then
 #        exit 1
 fi
 
-
 ${script_dir}/create_remote_repo.sh
-
 ${script_dir}/copy_repos.sh
 
-
 echo "Removing locks and destroying VM"
-cd $MDBCI_VM_PATH/$name
+
 if [ "$try_already_running" == "yes" ] ; then
   echo "Release lock for already running VM"
   rm $snapshot_lock_file