X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffaas%2Ffaas.yaml;h=426b8736d53bf555289f873c1846cc797212b997;hb=refs%2Fchanges%2F44%2F67844%2F1;hp=98c80bc87357e9155c311d2aa8dd63e0a42054be;hpb=69a85d8fe4dc39235b2d39fbfd0eb25708880f56;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 98c80bc87..426b8736d 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'faas'
@@ -17,7 +16,6 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
@@ -31,8 +29,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'faas'
@@ -44,7 +41,6 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
@@ -58,8 +54,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'faas'
@@ -72,7 +67,6 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
@@ -84,10 +78,9 @@
 - project:
     name: faas-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'faas'
     project-name: 'faas'
     branch: 'master'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'