Merge "Move genius Sonar scan to Sonarcloud"

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index fdd9d70a4dc091af2e4442514742e30f12e7ec82..bd6f2fef58cd9f70ca9d9736208f8096fb2b1059 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -7,21 +7,12 @@
           nexus-iq-namespace: odl-
           nexus-iq-stage: release
 
-      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
-      # - gerrit-maven-merge:
-      #     post_build_trigger:
-      #       - project:
-      #           - 'distribution-merge-{stream}'
-      #         condition: SUCCESS
-      #         trigger-with-no-params: true
-      - '{project-name}-merge-{stream}':
+      - gerrit-maven-merge:
           build-timeout: 180
-          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
       - gerrit-maven-stage:
           sign-artifacts: true
-          mvn-central: true
-          ossrh-profile-id: 6386ebbbf3a563
+          cron: ''
 
     java-version: openjdk11
     mvn-version: mvn35
@@ -48,8 +39,9 @@
 
       - gerrit-maven-stage:
           sign-artifacts: true
-          mvn-central: true
+          mvn-central: false
           ossrh-profile-id: 6386ebbbf3a563
+          cron: ''
 
     java-version: openjdk8
     mvn-version: mvn35