Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / opendaylight-infra-stack.sh

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 734a01b0fbc5617a24fb9ddb40dfb1640e9fe841..2a3e0cee5881477660daeab66e597321bcc54d88 100644 (file)
--- 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"