Switch all projects to use new maven-merge job

[releng/builder.git] / jjb / faas / faas.yaml

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 98c80bc87357e9155c311d2aa8dd63e0a42054be..e1bfa4d312db1f75a1b802655522be35578de88a 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -5,7 +5,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'faas'
@@ -32,7 +31,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'faas'
@@ -59,7 +57,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'faas'
@@ -84,7 +81,7 @@
 - project:
     name: faas-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'faas'
     project-name: 'faas'
     branch: 'master'