Create Neon jobs and bump fluorine branch

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

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 381f9bec3f6a981992609e3d8d8f9359290a72b9..972ec210a087332af21927858ae2c7656396460a 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -13,10 +13,17 @@ virtualenv "/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source "/tmp/v/openstack/bin/activate"
 pip install --upgrade "pip<10.0.0" setuptools
-pip install --upgrade python-openstackclient python-heatclient
+# 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" ]; then
+    cd /opt/ciman || 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"