X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;h=2a3e0cee5881477660daeab66e597321bcc54d88;hb=6737d651d0b72d9f2a4a127bee152da831d0a917;hp=734a01b0fbc5617a24fb9ddb40dfb1640e9fe841;hpb=f226a8f74eb66a8ef4b2dabdd6633138152f3251;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 734a01b0f..2a3e0cee5 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -1,4 +1,4 @@ -#!/bin/sh -l +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. @@ -16,8 +16,15 @@ else cd /builder/openstack-hot || exit 1 fi -# openstack cli is failing with the decorator package -sudo pip install --upgrade --quiet decorator +# shellcheck disable=SC1090 +. ~/lf-env.sh + +lf-activate-venv --python python3 \ + decorator \ + python-heatclient \ + python-openstackclient \ + python-magnumclient \ + yq JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}') VM_NAME="$JOB_SUM-$BUILD_NUMBER" @@ -60,7 +67,7 @@ for try in $(seq $STACK_RETRIES); do sleep 30 delete_status=$(openstack stack show "$STACK_NAME" -f value -c stack_status) echo "$j: $delete_status" - if [ "$delete_status" = "DELETE_FAILED" ]; then + if [[ $delete_status == "DELETE_FAILED" ]]; then reason=$(openstack stack show "$STACK_NAME" -f value -c stack_status_reason) echo "ERROR: Failed to delete $STACK_NAME. Reason: $reason"