Add Oxygen stream for OpFlex release job.

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

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 45eaae9f4c5b13ea623af4584aed9b6f568ef597..dd731f1ac4b034609f0b153ce0a7d9f213f092d9 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-virtualenv "$WORKSPACE/.venv-openstack"
-# shellcheck disable=SC1090
-source "$WORKSPACE/.venv-openstack/bin/activate"
+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
@@ -78,7 +78,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