From 2a5246a0a2c78e41b926f581a731bbed6d07bab3 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 18 Feb 2019 10:56:24 +0400 Subject: [PATCH] Switch to double-bracket bash's if Change-Id: Id2814e9da814a096fc5f6eb8372afb1af49d6f8d --- maintenance-ci/common/scripts/delete_heat_stack.sh | 8 ++++---- maintenance-ci/common/scripts/deploy_heat_stack.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/maintenance-ci/common/scripts/delete_heat_stack.sh b/maintenance-ci/common/scripts/delete_heat_stack.sh index 38929ed..8e07334 100755 --- a/maintenance-ci/common/scripts/delete_heat_stack.sh +++ b/maintenance-ci/common/scripts/delete_heat_stack.sh @@ -4,7 +4,7 @@ set -ex OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}" -if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then +if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then virtualenv "${OPENSTACK_CLIENTS_VENV}" source "${OPENSTACK_CLIENTS_VENV}"/bin/activate pip install openstackclient @@ -12,7 +12,7 @@ if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then fi function delete_stack() { - if [ -z "${VIRTUAL_ENV}" ]; then + if [[ -z "${VIRTUAL_ENV}" ]]; then source "${OPENSTACK_CLIENTS_VENV}"/bin/activate source "${OPENRC_FILE?}" fi @@ -27,9 +27,9 @@ function delete_stack() { source "${OPENSTACK_CLIENTS_VENV}"/bin/activate source "${OPENRC_FILE?}" - if [ ! -z "${STACK_NAME}" ] ; then + if [[ ! -z "${STACK_NAME}" ]] ; then delete_stack ${STACK_NAME} - elif [ ! -z "${STACK_PREFIX}" ] ; then + elif [[ ! -z "${STACK_PREFIX}" ]] ; then for stack in $(openstack stack list -c 'Stack Name' -f value) ; do if [[ ${stack} == ${STACK_PREFIX}* ]] ; then delete_stack ${stack} diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh index 93ea46b..80054b5 100755 --- a/maintenance-ci/common/scripts/deploy_heat_stack.sh +++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh @@ -4,7 +4,7 @@ set -ex OPENSTACK_CLIENTS_VENV="${OPENSTACK_CLIENTS_VENV:-/home/jenkins/venv-openstack-clients}" -if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then +if [[ ! -d "${OPENSTACK_CLIENTS_VENV}" ]] ; then virtualenv "${OPENSTACK_CLIENTS_VENV}" source "${OPENSTACK_CLIENTS_VENV}"/bin/activate pip install openstackclient @@ -12,13 +12,13 @@ if [ ! -d "${OPENSTACK_CLIENTS_VENV}" ] ; then fi parameter_string="" -if [ ! -z "${FLAVOR_NAME}" ] ; then +if [[ ! -z "${FLAVOR_NAME}" ]] ; then parameter_string="$parameter_string --parameter \"flavor=${FLAVOR_NAME}\"" fi -if [ ! -z "${IMAGE_NAME}" ] ; then +if [[ ! -z "${IMAGE_NAME}" ]] ; then parameter_string="$parameter_string --parameter \"image=${IMAGE_NAME}\"" fi -if [ ! -z "${JENKINS_LABELS}" ] ; then +if [[ ! -z "${JENKINS_LABELS}" ]] ; then parameter_string="$parameter_string --parameter \"jenkins_labels=${JENKINS_LABELS}\"" fi -- 2.45.2