Merge "Update Ansible playbooks to new names"

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index d9ee34086d2ae63530827af363b41a7f0e73e375..d697e548facaddf53fbe58f9d1859669181a7b09 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -1,4 +1,21 @@
 ---
+- job-group:
+    name: odl-maven-jobs
+
+    jobs:
+      - gerrit-maven-clm
+
+      - gerrit-maven-merge:
+          post_build_trigger:
+            - project:
+                - 'distribution-merge-{stream}'
+              condition: SUCCESS
+              trigger-with-no-params: true
+
+      - gerrit-maven-release
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
@@ -96,7 +113,7 @@
     triggers:
       - timed: 'H H * * 0'
       - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'