Merge "Update branch cutting script"

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 26d1c22fc67692b2fdf8d021ba5508292085a008..c7a309ad8e9e4db2986732970f528c30b095e3ff 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,15 +1,32 @@
 ---
+- project:
+    name: of-config-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
@@ -22,7 +39,6 @@
     name: of-config-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +57,6 @@
     name: of-config-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon