Merge "Migrate snmp to global-jjb Maven jobs"

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

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 45eaae9f4c5b13ea623af4584aed9b6f568ef597..edb3e40c9e7531d9043004b3cfd585d6db10a9c3 100644 (file)
--- 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.
@@ -78,7 +89,10 @@ for try in $(seq $STACK_RETRIES); do
             ;;
             *)
                 echo "Unexpected status: $OS_STATUS"
-                exit 1
+                # DO NOT exit on unexpected status. Rackspace sometimes returns unexpected status
+                # before returning an expected status. Just print the message and loop until we have
+                # a confirmed state or timeout.
+                # exit 1
             ;;
         esac
     done