Merge "Update branch cutting script"

[releng/builder.git] / jjb / ofextensions / circuitsw / circuitsw.yaml

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index aa2fb79461a6dc4ad04a44737d1ee435459a2644..2cdba404694c2c9a8605b46ab533ed627ce6f26e 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,14 +1,30 @@
 ---
+- project:
+    name: circuitsw-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'master'
+    mvn-settings: 'ofextensions-circuitsw-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[circuitsw]'
+
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
     name: circuitsw-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'master'
+    branch: 'stable/oxygen'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
@@ -20,7 +36,6 @@
 - project:
     name: circuitsw-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -38,7 +53,6 @@
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon