X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb-test%2Fexpected-xml%2Fgithub-ciman-packer-verify;h=6e84f2b7e870c690bc8dfd9bac47e90e82e43224;hb=fb9abdc112c25dc88c43fc094d0dd4a99385a211;hp=3e8223a6d4065ccf5f173d933bd4b116a4b9f0f0;hpb=4b3373319d2d9301e092a1171d6a51a48664523a;p=releng%2Fglobal-jjb.git
diff --git a/jjb-test/expected-xml/github-ciman-packer-verify b/jjb-test/expected-xml/github-ciman-packer-verify
index 3e8223a6..6e84f2b7 100644
--- a/jjb-test/expected-xml/github-ciman-packer-verify
+++ b/jjb-test/expected-xml/github-ciman-packer-verify
@@ -57,7 +57,16 @@ job is triggered by Gerrit.
Note that Gerrit will override this parameter automatically if a
job is triggered by Gerrit.
-
+ refs/heads/master
+
+
+ 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
PACKER_VERSION
@@ -347,6 +356,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
@@ -393,10 +414,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"