X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;h=a63d0ea4ba083efe34176eb072ce25d81aca008d;hb=00ddc9b8b67e06bbcb7bccaec0aa6e8f77a511a6;hp=0659504abc0fd2b416357dafd047d71e83c93cb9;hpb=9849af885fc9b6e0e5472ba4fc8d512a9b324b95;p=releng%2Fbuilder.git

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 0659504ab..a63d0ea4b 100644
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -12,12 +12,18 @@
 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 install --upgrade pipdeptree
-pipdeptree
+pip install --upgrade "pip<10.0.0" setuptools
+# hardcoding cmd2 version as the most recent version seems to be broken.
+# reference: https://pypi.org/project/cmd2/#history
+pip install --upgrade cmd2==0.8.5 python-openstackclient python-heatclient
+pip freeze
 
-cd /builder/openstack-hot || exit 1
+# TODO: Remove the if-statement once we have fully migrated to /opt/ciman
+if [ -d "/opt/ciman/openstack-hot" ]; then
+    cd /opt/ciman/openstack-hot || exit 1
+else
+    cd /builder/openstack-hot || exit 1
+fi
 
 JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}')
 VM_NAME="$JOB_SUM-$BUILD_NUMBER"
@@ -48,6 +54,7 @@ for try in $(seq $STACK_RETRIES); do
             CREATE_FAILED)
                 reason=$(openstack stack show "$STACK_NAME" -f value -c stack_status_reason)
                 echo "ERROR: Failed to initialize infrastructure. Reason: $reason"
+                openstack stack resource list -n 25 "$STACK_NAME"
 
                 echo "Deleting stack and possibly retrying to create..."
                 openstack stack delete --yes "$STACK_NAME"