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 d9c6a22bb16fa5b182d6097b1f67e06a76f49239..2cdba404694c2c9a8605b46ab533ed627ce6f26e 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,21 +1,34 @@
 ---
+- 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'
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -23,20 +36,16 @@
 - project:
     name: circuitsw-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -44,20 +53,16 @@
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/carbon'
-    jdks:
-      - openjdk8
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c