X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fnexus-iq-python-cli.sh;h=037d18915faf13b8cdcbd1bdbc6b3c9596e4d9b2;hb=refs%2Ftags%2Fv0.89.5;hp=b47bf74daab6d8952a3637710168c1c7df9df275;hpb=ca2f73d0ea1773eecba0fc7378fc94e489b2fa71;p=releng%2Fglobal-jjb.git

diff --git a/shell/nexus-iq-python-cli.sh b/shell/nexus-iq-python-cli.sh
index b47bf74d..037d1891 100644
--- a/shell/nexus-iq-python-cli.sh
+++ b/shell/nexus-iq-python-cli.sh
@@ -17,19 +17,29 @@ echo "---> nexus-iq-python-cli.sh"
 set -eu
 # do not print commands, credentials should not be logged
 set +x
-# check if tox established the prereqs for this analysis
-if [[ ! -f $REQUIREMENTS_FILE ]]; then
-    echo "ERROR: failed to find file $REQUIREMENTS_FILE"
-    exit 1
-fi
+
+# shellcheck disable=SC1090
+. ~/lf-env.sh
+
+lf-activate-venv --python python3 --venv-file /tmp/.nexusiq virtualenv
+
 CLI_LOCATION="/tmp/nexus-iq-cli-${NEXUS_IQ_CLI_VERSION}.jar"
 echo "INFO: downloading nexus-iq-cli version $NEXUS_IQ_CLI_VERSION"
 wget -nv "https://download.sonatype.com/clm/scanner/nexus-iq-cli-${NEXUS_IQ_CLI_VERSION}.jar" -O "${CLI_LOCATION}"
 echo "-a" > cli-auth.txt
 echo "${NEXUS_IQ_USER}:${NEXUS_IQ_PASSWORD}" >> cli-auth.txt
-echo "INFO: running nexus-iq-cli on project $NEXUS_IQ_PROJECT_NAME and file $REQUIREMENTS_FILE"
+if [ -z "${NEXUS_TARGET_BUILD}" ]; then
+    echo "WARN: NEXUS_TARGET_BUILD has not been set"
+fi
+echo "INFO: running nexus-iq-cli on project $NEXUS_IQ_PROJECT_NAME and target: ${NEXUS_TARGET_BUILD}"
+echo "Downloading Python dependencies into target directory"
+python3 -m pip download -r requirements.txt -d "${NEXUS_TARGET_BUILD}"
 # result.json is a mystery
-java -jar "${CLI_LOCATION}" @cli-auth.txt -s https://nexus-iq.wl.linuxfoundation.org -i "${NEXUS_IQ_PROJECT_NAME}" -t build -r result.json "${REQUIREMENTS_FILE}"
+# Do NOT double-quote ${NEXUS_TARGET_BUILD} below; causes breakage
+# shellcheck disable=SC2086
+java -jar "${CLI_LOCATION}" @cli-auth.txt \
+    -s https://nexus-iq.wl.linuxfoundation.org -i "${NEXUS_IQ_PROJECT_NAME}" \
+    -t build -r result.json ${NEXUS_TARGET_BUILD}
 rm cli-auth.txt
 rm "${CLI_LOCATION}"