X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=3d9a339fe8173ac0fc44b1d6e2a73d07fd491616;hb=1436f8f5f24783f9d3fae45f4344377f1a32cf68;hp=c6b7b4c13c0e6b63b4d8c056ba7a94bbbaa88c94;hpb=d190af926c7c0ef098c635fdae5b62350babffcc;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index c6b7b4c13..3d9a339fe 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -1,4 +1,26 @@
 ---
+- project:
+    name: controller-neon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: neon
+    project: 'controller'
+    project-name: 'controller'
+    branch: 'master'
+    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-fluorine
     jobs:
@@ -9,7 +31,7 @@
     stream: fluorine
     project: 'controller'
     project-name: 'controller'
-    branch: 'master'
+    branch: 'stable/fluorine'
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'