X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fofextensions%2Fcircuitsw%2Fcircuitsw.yaml;h=ab4d336fea6f5a46f649925a928f65d123b61fc8;hb=eeec1594ba258dba78e27033e1eb6a35b211a502;hp=f4784289fc0b310b1b9438563d08d74f2c2b47fa;hpb=87f0290467fed3322e4ee3bf8fd9fa2674c8bcd7;p=releng%2Fbuilder.git

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index f4784289f..ab4d336fe 100644
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -3,20 +3,13 @@
     name: circuitsw-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
@@ -29,20 +22,13 @@
     name: circuitsw-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
@@ -55,20 +41,13 @@
     name: circuitsw-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/carbon'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
@@ -80,10 +59,9 @@
 - project:
     name: circuitsw-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'