X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb-test%2Fexpected-xml%2Fgerrit-ciman-jjb-merge;fp=jjb-test%2Fexpected-xml%2Fgerrit-ciman-jjb-merge;h=9f8081ec6321f940a6cb776cbd8279641c607128;hb=687da407d7dd30b7d6414c6cca4038f17f8bc69b;hp=5432cdfd1b4663128409de67481506af195c0d7c;hpb=4b3373319d2d9301e092a1171d6a51a48664523a;p=releng%2Fglobal-jjb.git

diff --git a/jjb-test/expected-xml/gerrit-ciman-jjb-merge b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
index 5432cdfd..9f8081ec 100644
--- a/jjb-test/expected-xml/gerrit-ciman-jjb-merge
+++ b/jjb-test/expected-xml/gerrit-ciman-jjb-merge
@@ -64,6 +64,15 @@ job is triggered by Gerrit.
 </description>
           <defaultValue/>
         </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>LFTOOLS_VERSION</name>
+          <description>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 '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
+</description>
+          <defaultValue>&lt;1.0.0</defaultValue>
+        </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JJB_VERSION</name>
           <description>Jenkins Job Builder version to download and install.</description>
@@ -334,6 +343,18 @@ echo &quot;machine $machine login $user password $pass&quot; &gt; ~/.netrc
 ##############################################################################
 echo &quot;---&gt; lftools-install.sh&quot;
 
+# 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:
+#                          &lt;1.0.0
+#                          &gt;=1.0.0,&lt;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
@@ -380,10 +401,16 @@ case $LFTOOLS_MODE in
         ;;
 
     release)
-        pip install --quiet --upgrade &quot;lftools&lt;1.0.0&quot;
+        if [[ $LFTOOLS_VERSION =~ ^[0-9] ]]; then
+            LFTOOLS_VERSION=&quot;==$LFTOOLS_VERSION&quot;
+        fi
+
+        pip install --quiet --upgrade &quot;lftools${LFTOOLS_VERSION}&quot;
         ;;
 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 &quot;----&gt; Pip Dependency Tree&quot;