X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;h=e1e398ab05395f568510efa5272ed674a5979ed8;hb=428a47a10b3a6c59670063400095511d83d8cf51;hp=972ec210a087332af21927858ae2c7656396460a;hpb=f1e9624085a061ada85c6fa5e53bc5bf11569da8;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 972ec210a..e1e398ab0 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. @@ -9,22 +9,16 @@ # 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<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 - # TODO: Remove the if-statement once we have fully migrated to /opt/ciman -if [ -d "/opt/ciman" ]; then - cd /opt/ciman || exit 1 +if [ -d "/opt/ciman/openstack-hot" ]; then + cd /opt/ciman/openstack-hot || exit 1 else cd /builder/openstack-hot || exit 1 fi +# openstack cli is failing with the decorator package +sudo pip install --upgrade --quiet decorator + JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}') VM_NAME="$JOB_SUM-$BUILD_NUMBER"