Switch to using gjjb maven-merge jobs

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 5f7b0119a30adca7afb38a823adae35261022c21..840280f6477ddaf8d8b8b02275dd74a8957a54f1 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,9 +2,9 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-merge-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-merge
       - gerrit-tox-verify
 
     project: odlparent
@@ -39,9 +39,9 @@
 - project:
     name: odlparent-2.0.x
     jobs:
-      - '{project-name}-merge-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-merge
       - gerrit-tox-verify
 
     project: odlparent
@@ -79,9 +79,9 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-merge
       - gerrit-tox-verify
 
     stream: carbon