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 66bfcae955ae94def68574b7a918a826500f8ae1..2cdba404694c2c9a8605b46ab533ed627ce6f26e 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,25 +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
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -27,24 +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
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -52,24 +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
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -82,5 +75,4 @@
     project-name: 'circuitsw'
     branch: 'master'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'