From b00fefb9ade05788816a1b802644fc68614cdc64 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 19 Oct 2017 08:28:15 -0400 Subject: [PATCH] Add M2_HOME to Maven parameters Change-Id: I8557dbc46e742fbc5eeafecd3e23b060ceb200f1 Signed-off-by: Thanh Ha --- .jjb-test/expected-xml/gerrit-maven-maven-clm-master | 5 +++++ .jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master | 5 +++++ .jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master | 5 +++++ .jjb-test/expected-xml/gerrit-maven-maven-release-master | 5 +++++ .../gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 | 5 +++++ .../expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 | 5 +++++ .jjb-test/expected-xml/gerrit-maven-sonar | 5 +++++ .jjb-test/expected-xml/github-maven-maven-clm-master | 5 +++++ .jjb-test/expected-xml/github-maven-maven-javadoc-publish-master | 5 +++++ .jjb-test/expected-xml/github-maven-maven-javadoc-verify-master | 5 +++++ .jjb-test/expected-xml/github-maven-maven-release-master | 5 +++++ .../expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 | 5 +++++ .jjb-test/expected-xml/github-maven-sonar | 5 +++++ jjb/lf-macros.yaml | 6 ++++++ 14 files changed, 71 insertions(+) diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master index 150a594d..b7b10beb 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-clm-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-clm-master @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master index 11ddeefe..5df61316 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master index 2c88cf90..e964e94c 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-release-master b/.jjb-test/expected-xml/gerrit-maven-maven-release-master index 4e72be7c..ec86e1e9 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-release-master +++ b/.jjb-test/expected-xml/gerrit-maven-maven-release-master @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 index 8903c2bb..59bf5317 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 index 158b6501..60032328 100644 --- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-master-mvn33-openjdk8 @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/gerrit-maven-sonar b/.jjb-test/expected-xml/gerrit-maven-sonar index f46b5c04..3575cb74 100644 --- a/.jjb-test/expected-xml/gerrit-maven-sonar +++ b/.jjb-test/expected-xml/gerrit-maven-sonar @@ -74,6 +74,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/github-maven-maven-clm-master b/.jjb-test/expected-xml/github-maven-maven-clm-master index 8a9a67f5..784044c6 100644 --- a/.jjb-test/expected-xml/github-maven-maven-clm-master +++ b/.jjb-test/expected-xml/github-maven-maven-clm-master @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master index 395d7c40..db04105e 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master index 1ed885f2..7559cefe 100644 --- a/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master +++ b/.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/github-maven-maven-release-master b/.jjb-test/expected-xml/github-maven-maven-release-master index d36ee345..e207cc05 100644 --- a/.jjb-test/expected-xml/github-maven-maven-release-master +++ b/.jjb-test/expected-xml/github-maven-maven-release-master @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 index 4360311c..2a955ee3 100644 --- a/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 +++ b/.jjb-test/expected-xml/github-maven-maven-verify-master-mvn33-openjdk8 @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/.jjb-test/expected-xml/github-maven-sonar b/.jjb-test/expected-xml/github-maven-sonar index a5a7b686..d1419d46 100644 --- a/.jjb-test/expected-xml/github-maven-sonar +++ b/.jjb-test/expected-xml/github-maven-sonar @@ -69,6 +69,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'. <1.0.0 + + M2_HOME + Maven selector to be used by shell scripts + /w/tools/hudson.tasks.Maven_MavenInstallation/mvn33 + MAVEN_OPTS Maven Java opts. Example: -Xmx1024m -XX:MaxPermSize=256m diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 54a547db..374f5de8 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -229,6 +229,12 @@ - parameter: name: lf-infra-maven-parameters parameters: + - string: + name: M2_HOME + # Sets an env var for shell scripts to be able to call the dynamically + # installed maven without having to calculate the M2_HOME themselves. + default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{mvn-version}' + description: 'Maven selector to be used by shell scripts' - string: name: MAVEN_OPTS default: '{mvn-opts}' -- 2.16.6