diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-29 16:46:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-29 16:46:26 +0000 |
| commit | 8d56e29f3dd1fad74a678202a70eb9d8bbf00bfc (patch) | |
| tree | 4cb3d3014e6fde74fe7a9561a5fadf8844d1e458 | |
| parent | 8bf12376cc1ba62a4d26967d074a6de12996d644 (diff) | |
| parent | 4b89b339fc24c16955af03e7cb06fc21c48942d1 (diff) | |
Merge "prototypes: bifrost: Remove /opt/stack from previous deployments"
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-provision.sh | 2 | ||||
| -rwxr-xr-x | prototypes/bifrost/scripts/destroy-env.sh | 3 | ||||
| -rwxr-xr-x | prototypes/xci/xci-deploy.sh | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 782a23445..f596d7527 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -95,7 +95,7 @@ if [[ ! "$DISTRO" =~ (trusty|centos7|suse) ]]; then fi # remove previously cloned repos -sudo /bin/rm -rf /opt/bifrost /opt/stack /opt/releng +sudo /bin/rm -rf /opt/bifrost /opt/releng # Fix up permissions fix_ownership diff --git a/jjb/xci/xci-provision.sh b/jjb/xci/xci-provision.sh index ba447aa48..47a96767f 100755 --- a/jjb/xci/xci-provision.sh +++ b/jjb/xci/xci-provision.sh @@ -38,7 +38,7 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then fi # remove previously cloned repos -sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/stack /opt/releng /opt/functest +sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng /opt/functest # Fix up permissions fix_ownership diff --git a/prototypes/bifrost/scripts/destroy-env.sh b/prototypes/bifrost/scripts/destroy-env.sh index ce9d53538..d570f10ad 100755 --- a/prototypes/bifrost/scripts/destroy-env.sh +++ b/prototypes/bifrost/scripts/destroy-env.sh @@ -14,6 +14,9 @@ if [[ $(whoami) != "root" ]]; then exit 1 fi +# Start fresh +rm -rf /opt/stack + # Delete all libvirt VMs and hosts from vbmc (look for a port number) for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do virsh destroy $vm || true diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh index 326d659d4..277206dc7 100755 --- a/prototypes/xci/xci-deploy.sh +++ b/prototypes/xci/xci-deploy.sh @@ -40,7 +40,7 @@ echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- echo "Info: Cleaning up the previous deployment" $XCI_PATH/../bifrost/scripts/destroy-env.sh > /dev/null 2>&1 -/bin/rm -rf /opt/releng /opt/bifrost /opt/openstack-ansible /opt/stack +/bin/rm -rf /opt/releng /opt/bifrost /opt/openstack-ansible #------------------------------------------------------------------------------- # Clone the repositories and checkout the versions |