diff options
Diffstat (limited to 'ci/clean.sh')
| -rwxr-xr-x | ci/clean.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index aa14fe76..68d4dd36 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -6,7 +6,6 @@ jujuver=`juju --version` if [[ "$jujuver" > "2" ]]; then if [ ! -d labconfig.yaml ]; then - cp ~/joid_config/deployment.yaml ./deployment.yaml || true cp ~/joid_config/labconfig.yaml ./labconfig.yaml || true cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml || true fi @@ -19,8 +18,8 @@ fi if [[ "$jujuver" > "2" ]]; then - controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml` - cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployment.yaml` + 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 kill-controller $controllername --timeout 10s -y || true rm -rf precise rm -rf trusty |