X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight-infra-stack.sh;h=26e68becdf2288c4d89f867986242fe309cbdb68;hb=b0b38b35cb2994186d4e30d95b03faa2ba0736d8;hp=381f9bec3f6a981992609e3d8d8f9359290a72b9;hpb=36f24c357a6bb12f3fddcea88781421f28741fa6;p=releng%2Fbuilder.git diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index 381f9bec3..26e68becd 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,12 @@ # 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 - -cd /builder/openstack-hot || exit 1 +# 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 JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}') VM_NAME="$JOB_SUM-$BUILD_NUMBER"