X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffederation%2Ffederation.yaml;h=37d11172b169f04ec4dff84b2bbc83a0f1cf158e;hb=f2bb753ca34b150523d364b84618075edc6dd6f4;hp=170b0a4129b65937b2b0117b55e28c8c79acee67;hpb=8d1cf7dd5a3b2810e0640bac08cab52d721419c9;p=releng%2Fbuilder.git

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 170b0a412..37d11172b 100644
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -2,87 +2,68 @@
 - project:
     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: oxygen
     branch: 'master'
-    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
     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'
-    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-carbon
     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
-    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'