Fix yangtools sonar test coverage

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index d02900bbab7eed7d8ed977d21ec2f17f568fc659..5e64c12657bd2e0e397d74f73daca5c0a3e50dbc 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,8 +2,6 @@
 - project:
     name: yangtools-master
     jobs:
-      - 'gerrit-release-merge':
-          build-node: centos7-builder-2c-2g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -12,19 +10,47 @@
     branch: master
     stream: master
 
-    java-version: 'openjdk11'
-    mvn-settings: 'yangtools-settings'
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"
     mvn-version: mvn36
 
-    dependencies: ''
-    email-upstream: '[yangtools]'
+    dependencies: ""
+    email-upstream: "[yangtools]"
     archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: 1271cf710cc09d
+
+- project:
+    name: yangtools-5.0.x
+    jobs:
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: yangtools
+    project-name: yangtools
+    branch: 5.0.x
+    stream: 5.0.x
+
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"
+    mvn-version: mvn36
+
+    dependencies: ""
+    email-upstream: "[yangtools]"
+    archive-artifacts: >
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
@@ -40,18 +66,18 @@
     branch: 4.0.x
     stream: 4.0.x
 
-    java-version: 'openjdk11'
-    mvn-settings: 'yangtools-settings'
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"
 
-    dependencies: ''
-    email-upstream: '[yangtools]'
+    dependencies: ""
+    email-upstream: "[yangtools]"
     archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
@@ -67,41 +93,54 @@
     branch: v3.0.x
     stream: v3.0.x
 
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-settings: "yangtools-settings"
+    mvn-opts: "-Xmx1024m"
 
-    dependencies: ''
-    email-upstream: '[yangtools]'
+    dependencies: ""
+    email-upstream: "[yangtools]"
     archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
 
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
+- project:
+    name: yangtools-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: yangtools
+    project-name: yangtools
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: yangtools-settings
+
 - project:
     name: yangtools-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
-
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
+
+    project: "yangtools"
+    project-name: "yangtools"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "yangtools-settings"
+    mvn-opts: "-Xmx1024m"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: yangtools-info