X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;h=157b7435f3a454e64a114855be0e7c9dbfd7ea5e;hb=e592cb5321d5d46f29323a95685490edcfec76aa;hp=18766ea46c27ce506db3e83c10af25a7a68356aa;hpb=6e54d42d5a08f4bf66f0203f37acfc841e7e8f85;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 18766ea46..157b7435f 100644
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -1,18 +1,29 @@
 #!/bin/bash
-virtualenv "$WORKSPACE/.venv-openstack"
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv-openstack/bin/activate"
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+virtualenv "/tmp/v/openstack"
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
 pip install --upgrade pip
 pip install --upgrade python-openstackclient python-heatclient
-pip freeze
+pip install --upgrade pipdeptree
+pipdeptree
 
 cd /builder/openstack-hot || exit 1
 
 JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}')
 VM_NAME="$JOB_SUM-$BUILD_NUMBER"
 
-OS_TIMEOUT=10  # Minutes to wait for OpenStack VM to come online
-STACK_RETRIES=3  # Number of times to retry creating a stack before fully giving up
+OS_TIMEOUT=15  # Minutes to wait for OpenStack VM to come online
+STACK_RETRIES=2  # Number of times to retry creating a stack before fully giving up
 STACK_SUCCESSFUL=false
 # seq X refers to waiting for X minutes for OpenStack to return
 # a status that is not CREATE_IN_PROGRESS before giving up.
@@ -47,15 +58,7 @@ for try in $(seq $STACK_RETRIES); do
                     echo "$j: $STACK_SHOW"
                     if [[ $STACK_SHOW == *"DELETE_FAILED"* ]]; then
                         echo "stack delete failed. trying to stack abandon now"
-                        # stack abandon does not work on RS, therefore requires acquiring a token
-                        # and using http delete method to abondon DELETE_FAILED stacks
-                        # Todo: remove the change once RS fixes the issue upstream
-                        # openstack stack abandon "$STACK_NAME"
-                        STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
-                        TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
-                        curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
-                            -H "x-auth-token: $TOKEN"\
-                            "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
+                        openstack stack abandon "$STACK_NAME"
                         STACK_SHOW=$(openstack stack show "$STACK_NAME")
                         echo "$STACK_SHOW"
                     fi