X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=d6fc7143a79a70a258aa63d039db632f62af3043;hb=321d2beb638ea788003884f7aefdde104464c0cc;hp=8683803c404711ea897d2b00bc4261481ed585e5;hpb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 8683803c4..d6fc7143a 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: controller-oxygen
+    name: controller-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'controller'
     project-name: 'controller'
     branch: 'master'
@@ -22,37 +22,16 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
-- project:
-    name: controller-carbon
+    name: controller-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'controller'
     project-name: 'controller'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'