X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdiscovery%2Fdiscovery.yaml;h=25dc63a15a572cbf4cd08350d38aaf11ab377583;hb=2b0894555df9673b13e43bce6448c8f261250b64;hp=1c3fc5de23467a9921a17aa32c5833b89154c780;hpb=d6119dc76b089bef203aed5dd03c1e13fb8a167e;p=releng%2Fbuilder.git

diff --git a/jjb/discovery/discovery.yaml b/jjb/discovery/discovery.yaml
index 1c3fc5de2..25dc63a15 100644
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -1,64 +1,76 @@
-# ODL Releng build templates
+---
 - project:
-    name: discovery-boron
+    name: discovery-nitrogen
     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}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{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: True
-            disable_distribution_check: False
+    stream: nitrogen
     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'
     jdk: openjdk7
     jdks:
-        - openjdk7
+      - openjdk7
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'discovery-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: ''
     email-upstream: '[discovery]'
     archive-artifacts: ''
 
 - project:
-    name: discovery-beryllium
+    name: discovery-carbon
     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:
-        - beryllium:
-            disable_autorelease: True
-            disable_distribution_check: False
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: carbon
+    project: 'discovery'
+    project-name: 'discovery'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'discovery-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[discovery]'
+    archive-artifacts: ''
+
+- project:
+    name: discovery-boron
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: boron
     project: 'discovery'
     project-name: 'discovery'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
-        - openjdk7
+      - openjdk7
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'discovery-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: ''
     email-upstream: '[discovery]'
@@ -67,10 +79,10 @@
 - project:
     name: discovery-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'discovery'
     project-name: 'discovery'
     branch: 'master'
     mvn-settings: 'discovery-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'