From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 14 Nov 2022 04:38:10 +0000 (-0800)
Subject: jjb/pti-rtp: reuse lf-activate-venv to install lftools
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=58aa00871a967a6e962d1c554c07c04f6918ca42;p=ci-management.git

jjb/pti-rtp: reuse lf-activate-venv to install lftools

Reuse lf-activate-venv to install lftools if lf-env.sh
existes.

Issue-ID: INF-357

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I4d91f674a953e99bb9da0cbf014c72aedaff4663
---

diff --git a/jjb/pti-rtp/upload-inf.sh b/jjb/pti-rtp/upload-inf.sh
index 44826916..7a5d10d5 100644
--- a/jjb/pti-rtp/upload-inf.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -21,16 +21,21 @@ echo "--> upload-inf.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-echo "INFO: creating virtual environment"
-virtualenv -p python3 /tmp/venv
-PATH=/tmp/venv/bin:$PATH
-
-pip_pkgs="pip setuptools lftools"
-for pkg in $pip_pkgs; do
-    cmd_pip="python -m pip install -q --upgrade $pkg"
-    echo "INFO: installing packages: $cmd_pip"
-    $cmd_pip
-done
+if [[ -f ~/lf-env.sh ]]; then
+    source ~/lf-env.sh
+    lf-activate-venv --python python3 lftools
+else
+    echo "INFO: creating virtual environment"
+    virtualenv -p python3 /tmp/venv
+    PATH=/tmp/venv/bin:$PATH
+    
+    pip_pkgs="pip setuptools lftools"
+    for pkg in $pip_pkgs; do
+        cmd_pip="python -m pip install --upgrade $pkg"
+        echo "INFO: installing packages: $cmd_pip"
+        $cmd_pip
+    done
+fi
 
 # NEXUS_URL is set by Jenkins
 nexus_repo_id="images"