apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7143: try to fix jenkins problems with last 2 commits

Browse Source 
* bundle install needs to run before running the vbox cleaning scripts,
  so move prepare step before clean step
* feature branches have / in their name which is a bad character to
  put into filenames
This commit is contained in:
Leo Simons 2014-07-25 15:05:24 +02:00 committed by Rohit Yadav
parent 00b39de0f8
commit 35347f8350
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/appliance/build.sh
View File

@ -499,13 +499,13 @@ function hyperv_export() {
### ###
function main() { function main() {
prepare
if [ "${clean_vbox}" == "1" ]; then if [ "${clean_vbox}" == "1" ]; then
clean_vbox --delete clean_vbox --delete
add_on_exit clean_vbox --delete add_on_exit clean_vbox --delete
else else
stop_vbox # some extra encouragement for virtualbox to stop things stop_vbox # some extra encouragement for virtualbox to stop things
fi fi
prepare
create_definition create_definition
veewee_destroy # in case of left-over cruft from failed build veewee_destroy # in case of left-over cruft from failed build
add_on_exit veewee_destroy add_on_exit veewee_destroy