X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fyangtools%2Fyangtools.yaml;h=6482d9b4f870be5998b10805614ff86c2545b2b0;hb=80f914540e0579aed848d1a030fedf00d293411b;hp=9565ca6ba8422ea89a9a01bc0dd129559fc82eac;hpb=853876f42d8d8269a056c56eecc91f459e6edfbd;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 9565ca6ba..6482d9b4f 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,17 +2,17 @@
 - project:
     name: yangtools-master
     jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: yangtools
     project-name: yangtools
     branch: master
     stream: master
 
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-settings: "yangtools-settings"
-    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[yangtools]"
@@ -28,15 +28,45 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-4.0.x
+    name: yangtools-9.0.x
+    jobs:
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: yangtools
+    project-name: yangtools
+    branch: 9.0.x
+    stream: 9.0.x
+
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-settings: "yangtools-settings"
+
+    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
+
+- project:
+    name: yangtools-8.0.x
     jobs:
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
 
     project: yangtools
     project-name: yangtools
-    branch: 4.0.x
-    stream: 4.0.x
+    branch: 8.0.x
+    stream: 8.0.x
 
     java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
@@ -55,18 +85,19 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v3.0.x
+    name: yangtools-7.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: 7.0.x
+    stream: 7.0.x
 
+    java-version: "openjdk11"
     mvn-settings: "yangtools-settings"
-    mvn-opts: "-Xmx1024m"
+    mvn-version: mvn36
 
     dependencies: ""
     email-upstream: "[yangtools]"
@@ -91,6 +122,9 @@
 
     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
@@ -98,15 +132,18 @@
       - 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"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "yangtools-settings"
-    mvn-opts: "-Xmx1024m"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"