X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbgpcep%2Fbgpcep.yaml;h=7ee850daa5249f977640a5dc90c50c6fcfb3fb9d;hb=f7ef113e9b25afadcdd35f4221499d0be5f28b71;hp=be35a547018a6f87f4ba3c65ebdc9b0f157d6b16;hpb=be9a7c59e5367803ecd73ee6358e8a41d27e06c5;p=releng%2Fbuilder.git

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index be35a5470..7ee850daa 100644
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -19,26 +19,33 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
+        - pre-boron:
+            branch: 'pre-boron'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+            disable_autorelease: True
         - beryllium:
             branch: 'master'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            autorelease: False
+            disable_autorelease: True
         - stable-helium:
             branch: 'stable/helium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-            autorelease: False
+            disable_autorelease: True
 
     project: 'bgpcep'
 
@@ -84,6 +91,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -148,6 +157,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -263,7 +276,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: 'H H * * 7'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -390,7 +403,7 @@
 
     triggers:
         - reverse:
-            jobs: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},tcpmd5-merge-{stream}'
+            jobs: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream},tcpmd5-merge-{stream}'
             result: 'success'
 
     prebuilders:
@@ -413,7 +426,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[bgpcep] [odlparent] [yangtools] [controller] [tcpmd5]'
+            email-prefix: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
         - jacoco-report
 
 - job-template:
@@ -437,7 +450,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: 'pre-boron'
 
     wrappers:
         - build-timeout
@@ -446,7 +459,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: '@weekly'
         - gerrit-trigger-patch-sonar:
             name: 'bgpcep'
 
@@ -517,7 +530,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: '{bgpcep-settings}'
         global-settings: '{odl-global-settings}'
@@ -532,7 +545,7 @@
 
 - job-template:
     name: 'bgpcep-validate-autorelease-{stream}'
-    disabled: '{autorelease}'
+    disabled: '{obj:disable_autorelease}'
 
     project-type: maven
     node: dynamic_verify
@@ -574,9 +587,26 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'bgpcep'
-            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: 'bgpcep'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo