X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfrautils%2Finfrautils.yaml;h=8ebb6299014f62855c9c3d34e6697d0f107d0721;hb=f5611e3768895d4b4ca20c7719a2bd9fe5652fca;hp=8f4eb59fcf233b72f2786d438d00dc4da985dbbb;hpb=50ba79850e9238b1c99e961f5aae24d58c50c117;p=releng%2Fbuilder.git

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 8f4eb59fc..8ebb62990 100644
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -3,26 +3,17 @@
     name: infrautils-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
@@ -31,25 +22,16 @@
     name: infrautils-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
@@ -58,26 +40,17 @@
     name: infrautils-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
@@ -85,10 +58,9 @@
 - project:
     name: infrautils-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'infrautils'
     project-name: 'infrautils'
     branch: 'master'
     mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'