Switch all projects to use new maven-merge job
[releng/builder.git] / jjb / vtn / vtn.yaml
index 3ec5bb43f596e4f09572c18872fdaec0a4665133..69abc18b28be5b47a379f482e395d3cfee61e6a3 100644 (file)
@@ -6,7 +6,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'vtn'
@@ -38,7 +37,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'vtn'
@@ -70,7 +68,6 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'vtn'
@@ -99,7 +96,7 @@
 - project:
     name: vtn-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'vtn'
     project-name: 'vtn'
     branch: 'master'