Fix full-integration job to only run against ovsdb project

[releng/builder.git] / jjb-templates / merge.yaml

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index db400f33f620e628370a072c620888d6aee9bfd3..68f8c65c15f370ef2d63915ae681e6d666f0d5e0 100644 (file)
--- 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:
@@ -41,6 +41,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'PROJECT_PATH'
             branch: '{branch}'
@@ -55,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}'