X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;fp=jjb%2Fopendaylight-infra-stack.sh;h=6c12f0489c1dd71b940c189140458e3846200f54;hb=f0a7323681e161e04e8c750090bfdce566775723;hp=734a01b0fbc5617a24fb9ddb40dfb1640e9fe841;hpb=d2ba08430c99771c0905f37e6b2a14917905f65b;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 734a01b0f..6c12f0489 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -16,8 +16,25 @@ else cd /builder/openstack-hot || exit 1 fi -# openstack cli is failing with the decorator package -sudo pip install --upgrade --quiet decorator +# shellcheck disable=SC1090 +. ~/lf-env.sh + +# Check if openstack venv was previously created +if [ -f "/tmp/.os_lf_venv" ]; then + os_lf_venv=$(cat "/tmp/.os_lf_venv") +fi + +if [ -d "${os_lf_venv}" ] && [ -f "${os_lf_venv}/bin/openstack" ]; then + echo "Re-use existing venv: ${os_lf_venv}" + PATH=$os_lf_venv/bin:$PATH +else + lf-activate-venv --python python3 \ + decorator \ + python-heatclient \ + python-openstackclient \ + python-magnumclient \ + yq +fi JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}') VM_NAME="$JOB_SUM-$BUILD_NUMBER"