From 269e079f49f865648ebfc04c56f7c3a57294118f Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 8 Sep 2015 12:03:04 -0400 Subject: [PATCH] Add provide-maven-settings prebuilder to all templates Change-Id: Id7dbdeb6bff93e4c18c2534a265fe38db49915b7 Signed-off-by: Thanh Ha --- jjb-templates/clm.yaml | 3 +++ jjb-templates/daily.yaml | 3 +++ jjb-templates/distribution.yaml | 3 +++ jjb-templates/integration.yaml | 3 +++ jjb-templates/merge.yaml | 3 +++ jjb-templates/sonar.yaml | 3 +++ jjb-templates/verify.yaml | 3 +++ 7 files changed, 21 insertions(+) diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml index 6c92aa34e..fe82de666 100644 --- a/jjb-templates/clm.yaml +++ b/jjb-templates/clm.yaml @@ -32,6 +32,9 @@ prebuilders: - wipe-org-opendaylight-repo + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml index df0f0af96..3387de25b 100644 --- a/jjb-templates/daily.yaml +++ b/jjb-templates/daily.yaml @@ -42,6 +42,9 @@ prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml index fb2ed0517..e35c42660 100644 --- a/jjb-templates/distribution.yaml +++ b/jjb-templates/distribution.yaml @@ -38,6 +38,9 @@ prebuilders: - wipe-org-opendaylight-repo + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml index 7e7c1ab9a..b8d1c1f81 100644 --- a/jjb-templates/integration.yaml +++ b/jjb-templates/integration.yaml @@ -46,6 +46,9 @@ prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml index 2061221d2..fe3f190f5 100644 --- a/jjb-templates/merge.yaml +++ b/jjb-templates/merge.yaml @@ -44,6 +44,9 @@ prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml index d2faa2655..c2da3b543 100644 --- a/jjb-templates/sonar.yaml +++ b/jjb-templates/sonar.yaml @@ -35,6 +35,9 @@ prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml index 0c551d9e9..e3ce1f876 100644 --- a/jjb-templates/verify.yaml +++ b/jjb-templates/verify.yaml @@ -55,6 +55,9 @@ builders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' - maven-target: maven-version: '{mvn33}' pom: 'POM' -- 2.36.6