Remove nitrogen branches in projects

[releng/builder.git] / jjb / federation / federation.yaml

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 37d11172b169f04ec4dff84b2bbc83a0f1cf158e..d08bc6a4610996b65ef7e48f20c09453d9fea00e 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,14 +1,13 @@
 ---
 - project:
-    name: federation-oxygen
+    name: federation-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
-    stream: oxygen
+    stream: fluorine
     branch: 'master'
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -19,26 +18,7 @@
     staging-profile-id: 96f78c7a40a24
 
 - project:
-    name: federation-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
-- project:
-    name: federation-carbon
+    name: federation-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -46,9 +26,8 @@
 
     project: 'federation'
     project-name: 'federation'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    stream: oxygen
+    branch: 'stable/oxygen'
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'