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=2a3e0cee5881477660daeab66e597321bcc54d88;hb=fe057c97485074953ea037537bd2adf3332dc4bd;hp=58ad381747124e312a3684aa37b11c960d0c13b7;hpb=5a50b0e085a6eff3fb74306e31c95f1b7fb95723;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 58ad38174..2a3e0cee5 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -19,22 +19,12 @@ fi # 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 +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"