Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / pypi-upload.sh

diff --git a/shell/pypi-upload.sh b/shell/pypi-upload.sh
index e1ecfdf..e47135e 100644 (file)
--- 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==65.7.0 urllib3~=1.26.15 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"