X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnetconf%2Fnetconf.yaml;h=aeaa6bf468bc96db7496dd985dcc2724832b1b69;hb=3f26f0d97606964d92ae8ef8b05c911a40f58e19;hp=964c45816dccee9ce67a2709eba8cac66780f12c;hpb=e37e75ec6759746119c04393671b757f027772f0;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 964c45816..aeaa6bf46 100644
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,28 +1,53 @@
+---
 - project:
-    name: netconf-carbon
+    name: netconf-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}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'netconf-settings'
+    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
+    archive-artifacts: ''
+
+- project:
+    name: netconf-carbon
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: carbon
+    project: 'netconf'
+    project-name: 'netconf'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    jdk: openjdk8
+    jdks:
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -33,28 +58,24 @@
 - project:
     name: netconf-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}'
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -65,34 +86,25 @@
 - project:
     name: netconf-beryllium
     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:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
+    stream: beryllium
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk7
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean install -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -103,7 +115,7 @@
 - project:
     name: netconf-sonar
     jobs:
-        - '{project-name}-sonar'
+      - '{project-name}-sonar'
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'