X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffederation%2Ffederation.yaml;h=1cb290d7650ce8f0445bc02137e6fde154a3af59;hb=b4cf45c2f7b0f81a395a81f85718df294868429d;hp=8b9cb09b64fbe3fc519198e4afd44d1cb80c539c;hpb=8c76f3dfcc549f8e959de1d3a52b3885d1cde4ce;p=releng%2Fbuilder.git

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 8b9cb09b6..1cb290d76 100644
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,70 +1,37 @@
 ---
 - project:
-    name: federation-oxygen
+    name: federation-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
-    stream: oxygen
+    stream: fluorine
     branch: 'master'
-    jdks:
-      - openjdk8
-    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]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
-- project:
-    name: federation-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     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]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
 
 - project:
-    name: federation-carbon
+    name: federation-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    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}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
@@ -79,3 +46,9 @@
     branch: 'master'
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: federation
+    description: 'List of federation jobs'
+    regex: '^federation-.*'
+    <<: *releng_view_common