X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-release-master;h=dd4d3e85fb7247a8f7211dc504b1cc108d7511f6;hb=d5701687893b11024f892c00a5e81ca6d94d0866;hp=f045b179b92a3e4fd0844b871be477d4219e932b;hpb=4b3373319d2d9301e092a1171d6a51a48664523a;p=releng%2Fglobal-jjb.git
diff --git a/jjb-test/expected-xml/gerrit-maven-maven-release-master b/jjb-test/expected-xml/gerrit-maven-maven-release-master
index f045b179..dd4d3e85 100644
--- a/jjb-test/expected-xml/gerrit-maven-maven-release-master
+++ b/jjb-test/expected-xml/gerrit-maven-maven-release-master
@@ -63,7 +63,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
MAVEN_OPTS
@@ -213,6 +222,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
@@ -259,10 +280,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"
@@ -502,6 +529,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
@@ -548,10 +587,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"