X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;h=2a3e0cee5881477660daeab66e597321bcc54d88;hb=d84311e42ce8cf87bfda2e30682799feeaeb836d;hp=381f9bec3f6a981992609e3d8d8f9359290a72b9;hpb=dd127697545ae248565a4fb8b0468691bed3d522;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 381f9bec3..2a3e0cee5 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,14 +9,22 @@ # 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 -pip install --upgrade python-openstackclient python-heatclient -pip freeze +# 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 + +# shellcheck disable=SC1090 +. ~/lf-env.sh -cd /builder/openstack-hot || exit 1 +lf-activate-venv --python python3 \ + decorator \ + python-heatclient \ + python-openstackclient \ + python-magnumclient \ + yq JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}') VM_NAME="$JOB_SUM-$BUILD_NUMBER"