X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpypi-upload.sh;h=fee5766aaed9be8213dad06f988d5b00d85d80ea;hb=a86c6e8d376c95aa00b179fce9d207e61c8f72d0;hp=e1ecfdfbd6cca8f0a401a1919fb9472dbfbb2ce5;hpb=2ded6bf745aeb45cd14f9d09bd5822ebaf2bc1a2;p=releng%2Fglobal-jjb.git

diff --git a/shell/pypi-upload.sh b/shell/pypi-upload.sh
index e1ecfdfb..fee5766a 100644
--- a/shell/pypi-upload.sh
+++ b/shell/pypi-upload.sh
@@ -17,18 +17,26 @@ echo "---> pypi-upload.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-virtualenv -p python3 /tmp/pypi
-PATH=/tmp/pypi/bin:$PATH
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+# Version controlled by JJB_VERSION
+lf-activate-venv setuptools twine wheel readline
+
 
-pip install twine
 echo "INFO: cd to tox-dir $TOX_DIR"
 cd "$WORKSPACE/$TOX_DIR"
+
 cmd="twine upload -r $REPOSITORY dist/*"
 if $DRY_RUN; then
     echo "INFO: dry-run is set, echoing command only"
-    echo $cmd
+    echo "$cmd"
 else
-    echo "INFO: uploading distributions"
+    echo "INFO: uploading distributions to repo $REPOSITORY"
     $cmd
+    # emit message and files on single line for release-job
+    # shellcheck disable=SC2046
+    echo "INFO: successfully uploaded distributions: " $(ls dist)
 fi
+
 echo "---> pypi-upload.sh ends"