X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=233abe0a47ed199670338b5fbb75fe01f987e835;hb=b30e58394f7c9e1c7c354922cf2a27a83a0df15e;hp=c775346fb49060763eebb256ad629e4cf0b5144c;hpb=c2f9139cb7b57a9b83b657fc5b0aa91942e856ed;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index c775346fb..233abe0a4 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,15 +1,14 @@
 ---
 - project:
-    name: neutron-carbon
+    name: neutron-nitrogen
     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
+    stream: nitrogen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
@@ -28,7 +27,7 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-boron
+    name: neutron-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -37,10 +36,12 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/boron'
+    build-timeout: 60
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -55,7 +56,7 @@
     archive-artifacts: ''
 
 - project:
-    name: neutron-beryllium
+    name: neutron-boron
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
@@ -64,10 +65,11 @@
       - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: boron
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/beryllium'
+    branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8