Use correct parameter for stack deletion

Also use dash instead of underscore in deploy job

Change-Id: I837a78a642a1f150de2dbacb3b9248e9c4463363

diff --git a/maintenance-ci/common/scripts/delete_heat_stack.sh b/maintenance-ci/common/scripts/delete_heat_stack.sh
index 8e07334265e6656e2647ced0508577a0f11c1cb7..2386b73cda259f8dc91214e21e44547a8e56d850 100755 (executable)
--- a/maintenance-ci/common/scripts/delete_heat_stack.sh
+++ b/maintenance-ci/common/scripts/delete_heat_stack.sh
@@ -19,7 +19,7 @@ function delete_stack() {
   set +e
   eval $(openstack stack output show $1 floating_ip -f shell)
   ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no jenkins@$output_value "sudo service jenkins-swarm-agent stop"
-  openstack stack delete -y "${stack}"
+  openstack stack delete -y $1
   set -e
   return
 }

diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh
index eb3b3363d56b3613e870841a5b07d913a3edad7a..3ad514688c57e1ab6cba3f51197fe88544a25dd7 100755 (executable)
--- a/maintenance-ci/common/scripts/deploy_heat_stack.sh
+++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh
@@ -35,7 +35,7 @@ else
   md5_cmd="md5"
 fi
 
-STACK_NAME="${STACK_PREFIX:-swarm_slave}_$(head -c 100 /dev/urandom | "${md5_cmd}" | head -c 4)"
+STACK_NAME="${STACK_PREFIX:-swarm_slave}-$(head -c 100 /dev/urandom | "${md5_cmd}" | head -c 4)"
 
 set +x
 source "${OPENSTACK_CLIENTS_VENV}"/bin/activate