Merge "Make test-integration to rebase before build"

[releng/builder.git] / jjb / discovery / discovery.yaml

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index e431b38daaf926cbb4a858fd6cac0ba03761466c..2cc296dc76bf7e0226a95c7cb1024769aeaa2099 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -24,7 +24,7 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'discovery'
 
@@ -70,6 +70,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -134,6 +136,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -249,7 +255,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: 'H H * * 7'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -432,7 +438,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'discovery'
 
@@ -503,7 +509,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{discovery-settings}'
         global-settings: '{odl-global-settings}'
@@ -518,7 +524,7 @@
 
 - job-template:
     name: 'discovery-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify
@@ -560,9 +566,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'discovery'
-            branch: '{branch}'
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'discovery'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo