Do not specify maven maximum memory for infrautils

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

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index e1fa3d19c288ad689e9d8e35fdee573f2044a3de..fcca916fb6e9bfe23be3876b6329068033623803 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -17,7 +17,6 @@
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream}"
     email-upstream: "[infrautils] [odlparent]"
 
@@ -49,33 +48,6 @@
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-magnesium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: infrautils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
-          rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "infrautils"
-    project-name: "infrautils"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    mvn-settings: "infrautils-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream}"
-    email-upstream: "[infrautils] [odlparent]"
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
 - project:
     name: infrautils-release-management
     jobs:
@@ -90,7 +62,14 @@
 - project:
     name: infrautils-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
+
     project: "infrautils"
     project-name: "infrautils"
     branch: "master"