X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb-test%2Fexpected-xml%2Fgithub-python-tox-verify-master;h=2d499f84ca567c27ce614cb9d2bd818a7c58f123;hb=687da407d7dd30b7d6414c6cca4038f17f8bc69b;hp=cee75a7c64241fba1072d553757e4f21099208b7;hpb=4b3373319d2d9301e092a1171d6a51a48664523a;p=releng%2Fglobal-jjb.git
diff --git a/jjb-test/expected-xml/github-python-tox-verify-master b/jjb-test/expected-xml/github-python-tox-verify-master
index cee75a7c..2d499f84 100644
--- a/jjb-test/expected-xml/github-python-tox-verify-master
+++ b/jjb-test/expected-xml/github-python-tox-verify-master
@@ -59,6 +59,15 @@ job is triggered by Gerrit.
+
+ LFTOOLS_VERSION
+ Version of lftools to install. Can be a specific version like
+'0.6.0' or a PEP-440 definition.
+https://www.python.org/dev/peps/pep-0440/
+For example '<1.0.0' or '>=1.0.0,<2.0.0'.
+
+ <1.0.0
+
TOX_DIR
Path to directory containing tox.ini file.
@@ -152,6 +161,18 @@ Example: docs,py2,py3
##############################################################################
echo "---> lftools-install.sh"
+# Script to install lftools via a version passed in via lf-infra-parameters
+#
+# Required parameters:
+#
+# LFTOOLS_VERSION: Passed in via lf-infra-parameters configuration. Can be
+# set to a strict version number like '1.2.3' or using
+# PEP-440 definitions.
+#
+# Examples:
+# <1.0.0
+# >=1.0.0,<2.0.0
+#
# By default a released version of lftools should always be used.
# The purpose of the 2 variables below is so that lftools devs can test
# unreleased versions of lftools. There are 2 methods to install a dev version
@@ -198,10 +219,16 @@ case $LFTOOLS_MODE in
;;
release)
- pip install --quiet --upgrade "lftools<1.0.0"
+ if [[ $LFTOOLS_VERSION =~ ^[0-9] ]]; then
+ LFTOOLS_VERSION="==$LFTOOLS_VERSION"
+ fi
+
+ pip install --quiet --upgrade "lftools${LFTOOLS_VERSION}"
;;
esac
+lftools --version
+
# pipdeptree prints out a lot of information because lftools pulls in many
# dependencies. Let's only print it if we want to debug.
# echo "----> Pip Dependency Tree"
@@ -368,6 +395,18 @@ echo "machine $machine login $user password $pass" > ~/.netrc
##############################################################################
echo "---> lftools-install.sh"
+# Script to install lftools via a version passed in via lf-infra-parameters
+#
+# Required parameters:
+#
+# LFTOOLS_VERSION: Passed in via lf-infra-parameters configuration. Can be
+# set to a strict version number like '1.2.3' or using
+# PEP-440 definitions.
+#
+# Examples:
+# <1.0.0
+# >=1.0.0,<2.0.0
+#
# By default a released version of lftools should always be used.
# The purpose of the 2 variables below is so that lftools devs can test
# unreleased versions of lftools. There are 2 methods to install a dev version
@@ -414,10 +453,16 @@ case $LFTOOLS_MODE in
;;
release)
- pip install --quiet --upgrade "lftools<1.0.0"
+ if [[ $LFTOOLS_VERSION =~ ^[0-9] ]]; then
+ LFTOOLS_VERSION="==$LFTOOLS_VERSION"
+ fi
+
+ pip install --quiet --upgrade "lftools${LFTOOLS_VERSION}"
;;
esac
+lftools --version
+
# pipdeptree prints out a lot of information because lftools pulls in many
# dependencies. Let's only print it if we want to debug.
# echo "----> Pip Dependency Tree"