From ae9616bc295ec5922ac0bc518c967a219e35bd6d Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 18 Mar 2019 11:34:41 +0400 Subject: [PATCH] Use correct parameter for stack deletion Also use dash instead of underscore in deploy job Change-Id: I837a78a642a1f150de2dbacb3b9248e9c4463363 --- maintenance-ci/common/scripts/delete_heat_stack.sh | 2 +- maintenance-ci/common/scripts/deploy_heat_stack.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintenance-ci/common/scripts/delete_heat_stack.sh b/maintenance-ci/common/scripts/delete_heat_stack.sh index 8e07334..2386b73 100755 --- 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 eb3b336..3ad5146 100755 --- 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 -- 2.45.2