X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools.yaml;h=296e03610136e6b1c487f283487ad0c230ea79ae;hb=7c4da464d05ff1bb74426111813f9feddeefa870;hp=d02900bbab7eed7d8ed977d21ec2f17f568fc659;hpb=acac4a0740887c4f4d81e36b2fa2697bef65580f;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index d02900bba..296e03610 100644
--- 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,96 +10,114 @@
     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-4.0.x
+    name: yangtools-7.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: 7.0.x
+    stream: 7.0.x
 
-    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-v3.0.x
+    name: yangtools-6.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: 6.0.x
+    stream: 6.0.x
 
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
+    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-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: yangtools
+    project-name: yangtools
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: yangtools-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 90
+
 - 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