From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Fri, 24 Jan 2020 00:25:57 +0000 (-0500)
Subject: Show python and pip versions in log
X-Git-Tag: v0.51.0~21
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F62926%2F2;p=releng%2Fglobal-jjb.git

Show python and pip versions in log

Extend shell scripts that invoke pip freeze to show
python and pip versions also.

Change-Id: I75fff4d379a7cbd27aa867c2cae4f2fd2dde2c31
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---

diff --git a/releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml b/releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml
new file mode 100644
index 00000000..97b36337
--- /dev/null
+++ b/releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Extend shell scripts that invoke pip freeze to show
+    python and pip versions also
diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh
index baaa5d70..d0c0e4a4 100644
--- a/shell/jjb-install.sh
+++ b/shell/jjb-install.sh
@@ -24,5 +24,7 @@ echo "JJB_VENV=$JJB_VENV" > "$WORKSPACE/.jjb.properties"
 source "$JJB_VENV/bin/activate"
 python -m pip install --quiet --upgrade "jenkins-job-builder==$JJB_VERSION"
 
-echo "----> pip freeze"
+# installs are silent, show version details in log
+python --version
+pip --version
 pip freeze
diff --git a/shell/node-install.sh b/shell/node-install.sh
index da6cfe43..7200ea35 100644
--- a/shell/node-install.sh
+++ b/shell/node-install.sh
@@ -20,5 +20,7 @@ source "/tmp/v/python/bin/activate"
 pip install --quiet --upgrade "pip==9.0.3" setuptools
 pip install --quiet --upgrade nodeenv
 
-echo "----> pip freeze"
+# installs are silent, show version details in log
+python --version
+pip --version
 pip freeze
diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 2b2b0f80..3a852d34 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -38,6 +38,8 @@ EOF
     python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools
     python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file"
     # installs are silent, show version details in log
+    python3 --version
+    python3 -m pip --version
     python3 -m pip freeze
     rm -rf "$requirements_file"
     touch /tmp/pre-build-complete
diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index f8472cc9..cc815ccd 100644
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -16,12 +16,13 @@ set -eux -o pipefail
 
 # Tox version is pulled in through detox to mitigate version conflict
 
-
 if [[ $PYTHON == "python2" ]]; then
     $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
 else
     $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
 fi
 
-
+# installs are silent, show version details in log
+$PYTHON --version
+$PYTHON -m pip --version
 $PYTHON -m pip freeze