diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2017-10-27 08:31:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-27 08:31:56 +0000 |
commit | cad8852bf819f51f2e9602b11d4fc8b723623006 (patch) | |
tree | d78bf4fb4ebd94df2a7d8209944b879b9c1fd1c0 /ci/clean.sh | |
parent | 0b6cf885239f5612c19db205d9a827572ad73c8a (diff) | |
parent | 2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (diff) |
Merge "cleanup code"
Diffstat (limited to 'ci/clean.sh')
-rwxr-xr-x | ci/clean.sh | 62 |
1 files changed, 16 insertions, 46 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 5005b594..1f3ef54f 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -2,52 +2,22 @@ set -ex -jujuver=`juju --version` - -if [[ "$jujuver" > "2" ]]; then - if [ ! -d labconfig.yaml ]; then - cp ~/joid_config/labconfig.yaml ./labconfig.yaml || true - if [ -d $HOME/joid_config/deployconfig.yaml ]; then - cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml || true - else - python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml - fi - fi -else - if [ ! -d environments.yaml ]; then - cp ~/joid_config/environments.yaml ./environments.yaml || true - cp ~/.juju/environments.yaml ./environments.yaml || true - fi -fi - - -if [[ "$jujuver" > "2" ]]; then - controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml` - cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml` - juju destroy-controller $controllername --destroy-all-models -y || true -# juju kill-controller $controllername --timeout 10s -y || true - rm -rf precise - rm -rf trusty - rm -rf xenial - rm -rf ~/joid_config/admin-openrc - sleep 10 - sudo sysctl -w vm.drop_caches=3 -elif [ -d $HOME/.juju/environments ]; then - echo " " > status.txt - juju status &>>status.txt || true - if [ "$(grep -c "environment is not bootstrapped" status.txt )" -ge 1 ]; then - echo " environment is not bootstrapped ..." +if [ ! -d labconfig.yaml ]; then + cp ~/joid_config/labconfig.yaml ./labconfig.yaml || true + if [ -d $HOME/joid_config/deployconfig.yaml ]; then + cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml || true else - echo " environment is bootstrapped ..." - jujuenv=`juju status | grep environment | cut -d ":" -f 2` - juju destroy-environment $jujuenv -y || true + python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml fi - rm -rf precise - rm -rf trusty - rm -rf xenial - rm -rf $HOME/.juju/j* - rm -rf $HOME/.juju/.deployer-store-cache - rm -rf $HOME/.juju/environments - rm -rf $HOME/.juju/ssh - sudo sysctl -w vm.drop_caches=3 fi + +controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml` +cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml` +juju destroy-controller $controllername --destroy-all-models -y || true +#juju kill-controller $controllername --timeout 10s -y || true +rm -rf precise +rm -rf trusty +rm -rf xenial +rm -rf ~/joid_config/admin-openrc +sleep 10 +sudo sysctl -w vm.drop_caches=3 |