X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffederation%2Ffederation.yaml;h=f7ab6e22a85940ff69056cceede35730bec660e0;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=789356b9dfb194816de742af00386e59cc2f2cc9;hpb=ece6a462c2e9580514d1e610d8f81c1e805e6685;p=releng%2Fbuilder.git

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 789356b9d..f7ab6e22a 100644
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -1,68 +1,72 @@
 ---
 - project:
-    name: federation-nitrogen
+    name: federation-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    project: 'federation'
+    project-name: 'federation'
+    stream: oxygen
+    branch: 'master'
+    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-nitrogen
+    jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
     stream: nitrogen
-    branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     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
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-validate-autorelease-{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
-    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-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'