X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fmerge.yaml;h=d9ee40ff8c10f4cd5acaa5cc560ff3bf308f067b;hb=8651b7df8d4f0973c495691389ec872e49d2955c;hp=60339777e09b1bdc9a32c708991a60dd09189f19;hpb=d2536439579299085edf4149646f049286671ad8;p=releng%2Fbuilder.git diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml index 60339777e..d9ee40ff8 100644 --- a/jjb-templates/merge.yaml +++ b/jjb-templates/merge.yaml @@ -15,14 +15,18 @@ 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: + branch: '{branch}' + - gerrit-refspec-parameter: + refspec: 'refs/heads/{branch}' scm: - gerrit-trigger-scm: @@ -37,6 +41,7 @@ - '{ssh-credentials}' triggers: + - timed: 'H H * * 0' - gerrit-trigger-patch-merged: name: 'PROJECT_PATH' branch: '{branch}' @@ -51,7 +56,7 @@ maven: maven-name: '{mvn33}' root-pom: 'POM' - goals: 'MAVEN_GOALS -Dmerge -Dstream={stream}' + goals: 'MAVEN_GOALS -Djenkins -Dmerge -Dstream={stream}' maven-opts: 'MAVEN_OPTS' settings: '{JENKINS_SETTINGS}' global-settings: '{odl-global-settings}'