X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fof-config%2Fof-config.yaml;h=26d1c22fc67692b2fdf8d021ba5508292085a008;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=465e54c59a5eaf4a9ddde25618a04e286c09d645;hpb=bde01fbe1d1f97d231086b2a4eed5deaaea11328;p=releng%2Fbuilder.git

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 465e54c59a..26d1c22fc6 100644
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -4,24 +4,16 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -31,24 +23,16 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -58,25 +42,17 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'of-config'
     project-name: 'of-config'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -84,10 +60,9 @@
 - project:
     name: of-config-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'