Merge "Do not trigger distribution-merge by controller"

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index d5315072d4a212ffedcf2728325ce983a94d0e6e..97a950be70c11b79d6da08c869dd8eebd379fcc4 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -4,6 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
@@ -19,6 +21,7 @@
     branch: 'master'
     java-version: 'openjdk11'
     mvn-settings: 'infrautils-settings'
+    mvn-version: mvn36
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'