X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffederation%2Ffederation.yaml;h=d680b128fd042eea71019e7f3254429a700deb9b;hb=39a0450315a14058a0c8fd7eb8c53fad2637249f;hp=3482598c52021ac08d9985bbc20a5891472e0e2c;hpb=7ea27cc20a9f252f4196db2ce52da4ef7c3b73cb;p=releng%2Fbuilder.git

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 3482598c5..d680b128f 100644
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -4,20 +4,14 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{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]'
@@ -31,20 +25,14 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{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]'
@@ -58,21 +46,15 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{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]'
@@ -90,5 +72,4 @@
     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'