X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffederation%2Ffederation.yaml;h=10b837d8949fe0a8ef002e7f86731e26a91f17a0;hb=refs%2Fchanges%2F61%2F74961%2F4;hp=305192f6645f018b4df5d9f97d756704d3c93fc7;hpb=4aaa45a1cafdf3191f28a3885a7010fa966a6bda;p=releng%2Fbuilder.git

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 305192f66..114719cb3 100644
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,91 +1,72 @@
 ---
 - project:
-    name: federation-oxygen
+    name: federation-neon
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
-    stream: oxygen
+    stream: neon
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     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
+    name: federation-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
-    stream: nitrogen
-    branch: 'stable/nitrogen'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     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}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    stream: oxygen
+    branch: 'stable/oxygen'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     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-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'federation'
     project-name: 'federation'
     branch: 'master'
     mvn-settings: 'federation-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: federation
+    description: 'List of federation jobs'
+    regex: '^federation-.*'
+    <<: *releng_view_common