Remove nitrogen branches in projects

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

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index aa2fb79461a6dc4ad04a44737d1ee435459a2644..4198831a93a588c4e330cce3bcbf7878fd46af66 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: circuitsw-oxygen
+    name: circuitsw-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
@@ -18,33 +17,14 @@
     staging-profile-id: a68970cf5b25c
 
 - project:
-    name: circuitsw-nitrogen
-    jobs:
-      - '{project-name}-integration-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/nitrogen'
-    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-carbon
+    name: circuitsw-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/carbon'
+    branch: 'stable/oxygen'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''