Merge "Revert "Remove unused maven merge job""

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f64aa99f3329622874585309262f15ca8336cb03..25cbf15c2ff0782480eff5ac98f1bdfc9154a78d 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -1,7 +1,35 @@
 ---
+- 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:
+          build-timeout: 180
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    mvn-goals: clean install
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'