Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / opendaylight-infra-stack.sh

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index a63d0ea4ba083efe34176eb072ce25d81aca008d..2a3e0cee5881477660daeab66e597321bcc54d88 100644 (file)
--- 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,15 +9,6 @@
 # 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/openstack-hot" ]; then
     cd /opt/ciman/openstack-hot || exit 1
@@ -25,6 +16,16 @@ else
     cd /builder/openstack-hot || exit 1
 fi
 
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+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"