Switch all projects to use new maven-merge job

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

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index e4a06da35d66c5aaccec0df0aea7fcf0c4d5ba5c..7b4460c0154c3c098ea85556c50f3b17f79a9d64 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.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: 'cardinal'
@@ -32,7 +31,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'cardinal'
@@ -59,7 +57,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'cardinal'
@@ -84,7 +81,7 @@
 - project:
     name: cardinal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'cardinal'
     project-name: 'cardinal'