X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb-templates%2Fmerge.yaml;h=cb84b99dfa4595614bf7dcb28c38577efcf86c06;hb=refs%2Fchanges%2F58%2F40758%2F1;hp=c416ea8664659ae0016633c5cf2678e376c3c1fd;hpb=14b7fe1a9cf8b3ff2e3df9222419d33f5521f173;p=releng%2Fbuilder.git diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml index c416ea866..cb84b99df 100644 --- a/jjb-templates/merge.yaml +++ b/jjb-templates/merge.yaml @@ -15,17 +15,17 @@ jdk: '{jdk}' logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' + daysToKeep: '14' + numToKeep: '10' artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - project-parameter: project: '{project}' - - gerrit-parameter: + - gerrit-parameters: + project: '{project}' branch: '{branch}' - - gerrit-refspec-parameter: refspec: 'refs/heads/{branch}' scm: @@ -56,7 +56,7 @@ maven: maven-name: '{mvn33}' root-pom: 'POM' - goals: 'MAVEN_GOALS -Djenkins -Dmerge -Dstream={stream}' + goals: 'MAVEN_GOALS -V -B -Djenkins -Dmerge -Dstream={stream}' maven-opts: 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}' @@ -78,7 +78,7 @@ - maven-target: maven-version: '{mvn33}' pom: pom.xml - goals: 'site:deploy -Dstream={stream}' + goals: 'site:deploy -V -B -Dstream={stream}' java-opts: - '-Xmx2g' settings: '{JENKINS_SETTINGS}' @@ -86,7 +86,7 @@ - maven-target: maven-version: '{mvn33}' pom: deploy-site.xml - goals: 'site:deploy -Dstream={stream}' + goals: 'site:deploy -V -B -Dstream={stream}' java-opts: - '-Xmx2g' settings: '{JENKINS_SETTINGS}'