From fe8f6531947ae65939e977117f9b281fbe14bed3 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sun, 5 Feb 2017 08:24:01 -0600 Subject: cleanup task. Change-Id: I287e80899225c611752117ab29f079de7ba25f58 Signed-off-by: Narinder Gupta --- ci/clean.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ci/clean.sh') 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 -- cgit 1.2.3-korg