Merge "Remove odlparent-6.0.x jobs"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 9565ca6ba8422ea89a9a01bc0dd129559fc82eac..6b3aa703fcac71c1937b041c4edc80d597546c3f 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -28,18 +28,19 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-4.0.x
+    name: yangtools-6.0.x
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: 4.0.x
-    stream: 4.0.x
+    branch: 6.0.x
+    stream: 6.0.x
 
     java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
+    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[yangtools]"
@@ -55,18 +56,19 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v3.0.x
+    name: yangtools-5.0.x
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v3.0.x
-    stream: v3.0.x
+    branch: 5.0.x
+    stream: 5.0.x
 
+    java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
-    mvn-opts: "-Xmx1024m"
+    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[yangtools]"
@@ -98,8 +100,10 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "yangtools"
     project-name: "yangtools"