X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=48bd2756b3409ee45db5694df9ed7bfd748ee476;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=9c1c89196138302b00d58a19600223b0c941408c;hpb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 9c1c89196..48bd2756b 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: neutron-oxygen
+    name: neutron-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 90
@@ -20,38 +20,17 @@
     staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
-- project:
-    name: neutron-carbon
+    name: neutron-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    build-timeout: 90
+    branch: 'stable/oxygen'
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'