From: Anil Shashikumar Belur Date: Tue, 15 Aug 2017 00:38:04 +0000 (+0000) Subject: Merge changes I7d7323b8,Ib796cfee X-Git-Tag: v0.7.0~8 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=fb9abdc112c25dc88c43fc094d0dd4a99385a211;hp=--cc;p=releng%2Fglobal-jjb.git Merge changes I7d7323b8,Ib796cfee * changes: Add default refspec reference Refactor packer ci templates --- fb9abdc112c25dc88c43fc094d0dd4a99385a211 diff --cc jjb-test/expected-xml/gerrit-ciman-jjb-merge index 9f8081ec,93149c92..12b0e870 --- a/jjb-test/expected-xml/gerrit-ciman-jjb-merge +++ b/jjb-test/expected-xml/gerrit-ciman-jjb-merge @@@ -62,17 -62,8 +62,17 @@@ 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 + JJB_VERSION Jenkins Job Builder version to download and install. diff --cc jjb-test/expected-xml/gerrit-ciman-jjb-verify index d5580b3b,61e2a613..69c3166f --- a/jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/jjb-test/expected-xml/gerrit-ciman-jjb-verify @@@ -62,17 -62,8 +62,17 @@@ 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 + JJB_VERSION Jenkins Job Builder version to download and install. diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder index 87b5ec98,4fde5906..0565e3cb --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-java-builder @@@ -62,17 -62,8 +62,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet index 1a7fde3e,771c62e9..1bcd1550 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-centos-mininet @@@ -62,17 -62,8 +62,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder index 0a54424c,17135603..7cf25b58 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-java-builder @@@ -62,17 -62,8 +62,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet index 62c6857e,62be790c..73c50d51 --- a/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet +++ b/jjb-test/expected-xml/gerrit-ciman-packer-merge-ubuntu1604-mininet @@@ -62,17 -62,8 +62,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/gerrit-ciman-packer-verify index 5c963fff,51f67c04..04a3f527 --- a/jjb-test/expected-xml/gerrit-ciman-packer-verify +++ b/jjb-test/expected-xml/gerrit-ciman-packer-verify @@@ -62,17 -62,8 +62,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/gerrit-maven-maven-clm-master index 8d5c7a38,6786db91..150a594d --- a/jjb-test/expected-xml/gerrit-maven-maven-clm-master +++ b/jjb-test/expected-xml/gerrit-maven-maven-clm-master @@@ -63,17 -63,8 +63,17 @@@ 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 Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --cc jjb-test/expected-xml/gerrit-maven-maven-release-master index b391637f,dd9ddc3c..dd4d3e85 --- a/jjb-test/expected-xml/gerrit-maven-maven-release-master +++ b/jjb-test/expected-xml/gerrit-maven-maven-release-master @@@ -63,17 -63,8 +63,17 @@@ 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 Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --cc jjb-test/expected-xml/gerrit-python-tox-verify-master index 6908475a,30fa7f18..885d5a27 --- a/jjb-test/expected-xml/gerrit-python-tox-verify-master +++ b/jjb-test/expected-xml/gerrit-python-tox-verify-master @@@ -62,17 -62,8 +62,17 @@@ 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 + TOX_DIR Path to directory containing tox.ini file. diff --cc jjb-test/expected-xml/github-ciman-jjb-merge index ad689da7,ab6cdb5b..12a55551 --- a/jjb-test/expected-xml/github-ciman-jjb-merge +++ b/jjb-test/expected-xml/github-ciman-jjb-merge @@@ -57,17 -57,8 +57,17 @@@ 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 + JJB_VERSION Jenkins Job Builder version to download and install. diff --cc jjb-test/expected-xml/github-ciman-jjb-verify index 83cd7fda,1f0e9d5b..0d8d5b2b --- a/jjb-test/expected-xml/github-ciman-jjb-verify +++ b/jjb-test/expected-xml/github-ciman-jjb-verify @@@ -57,17 -57,8 +57,17 @@@ 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 + JJB_VERSION Jenkins Job Builder version to download and install. diff --cc jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder index 1f75c0c0,36755e61..38be9216 --- a/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder +++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-java-builder @@@ -57,17 -57,8 +57,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet index bee3db07,44c9896a..9fb389f4 --- a/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet +++ b/jjb-test/expected-xml/github-ciman-packer-merge-centos-mininet @@@ -57,17 -57,8 +57,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder index b3ca61ca,c8ff4420..d7df7956 --- a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder +++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-java-builder @@@ -57,17 -57,8 +57,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet index 8bc173bf,a48988a6..fe4bb8a6 --- a/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet +++ b/jjb-test/expected-xml/github-ciman-packer-merge-ubuntu1604-mininet @@@ -57,17 -57,8 +57,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/github-ciman-packer-verify index 20da5d3b,5386b738..6e84f2b7 --- a/jjb-test/expected-xml/github-ciman-packer-verify +++ b/jjb-test/expected-xml/github-ciman-packer-verify @@@ -57,17 -57,8 +57,17 @@@ 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 Packer version to download and install. diff --cc jjb-test/expected-xml/github-maven-maven-clm-master index cfe33590,414d3d40..8a9a67f5 --- a/jjb-test/expected-xml/github-maven-maven-clm-master +++ b/jjb-test/expected-xml/github-maven-maven-clm-master @@@ -58,17 -58,8 +58,17 @@@ 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 Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --cc jjb-test/expected-xml/github-maven-maven-release-master index 9186d878,9a415e25..73aba06d --- a/jjb-test/expected-xml/github-maven-maven-release-master +++ b/jjb-test/expected-xml/github-maven-maven-release-master @@@ -58,17 -58,8 +58,17 @@@ 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 Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --cc jjb-test/expected-xml/github-python-tox-verify-master index 2d499f84,7a8a99be..31b825ec --- a/jjb-test/expected-xml/github-python-tox-verify-master +++ b/jjb-test/expected-xml/github-python-tox-verify-master @@@ -57,17 -57,8 +57,17 @@@ 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 + TOX_DIR Path to directory containing tox.ini file.