hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build VM restore process

Browse Source 
Moving 'mdbci destroy' bofere creating build.json to prevent
build.json from being deleted by 'destroy' command.
This commit is contained in:
Timofey Turenko
2018-03-22 10:49:27 +02:00
parent 041b775150
commit 830858a161
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BUILD/mdbci/build.sh
View File

@ -52,6 +52,12 @@ if [ "${try_already_running}" == "yes" ]; then
fi fi
if [ "$already_running" != "ok" ]; then 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 eval "cat <<EOF
$(<${script_dir}/templates/build.json.template) $(<${script_dir}/templates/build.json.template)
@ -64,11 +70,6 @@ $(<${script_dir}/templates/build.json.template)
touch ~/vagrant_lock touch ~/vagrant_lock
echo $JOB_NAME-$BUILD_NUMBER >> ~/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 # starting VM for build
echo "Generating build VM template" echo "Generating build VM template"
${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name ${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name
@ -104,14 +105,11 @@ if [ $? -eq 0 ] ; then
# exit 1 # exit 1
fi fi
${script_dir}/create_remote_repo.sh ${script_dir}/create_remote_repo.sh
${script_dir}/copy_repos.sh ${script_dir}/copy_repos.sh
echo "Removing locks and destroying VM" echo "Removing locks and destroying VM"
cd $MDBCI_VM_PATH/$name
if [ "$try_already_running" == "yes" ] ; then if [ "$try_already_running" == "yes" ] ; then
echo "Release lock for already running VM" echo "Release lock for already running VM"
rm $snapshot_lock_file rm $snapshot_lock_file