X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Focpplugin%2Focpplugin.yaml;h=58c3370d153952f604e597503559d55f8e009de9;hb=c00dec408acd98d2996abbbf5b5050e9a2046e96;hp=34ad50c9fab519eaa9b93470439275e6032e9232;hpb=c704ad6829ed67eb82f055b5dcf8f459993345c8;p=releng%2Fbuilder.git

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index 34ad50c9f..58c3370d1 100644
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -1,33 +1,78 @@
-# ODL Releng build templates
 - project:
-    name: ocpplugin
+    name: ocpplugin-carbon
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
+        - carbon:
             disable_autorelease: False
             disable_distribution_check: False
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'ocpplugin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
 
+- project:
+    name: ocpplugin-boron
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
+        - boron:
+            disable_autorelease: False
+            disable_distribution_check: False
     project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'stable/boron'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
     archive-artifacts: ''
 
+- project:
+    name: ocpplugin-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'ocpplugin'
+    project-name: 'ocpplugin'
+    branch: 'master'
+    mvn-settings: 'ocpplugin-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'