Merge "Update cloud image Ubuntu18.04 helm x86_64"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 61eba730d3fe838f1ce443330957947842ab4c53..57a731be5982f93c1b6ef23febd3c95f48f0f154 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,17 +2,16 @@
 - project:
     name: yangtools-master
     jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-      - odl-maven-verify-jobs-jdk17:
-        build-node: centos8-builder-4c-4g
+      - 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"
 
     dependencies: ""
@@ -85,34 +84,6 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-6.0.x
-    jobs:
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: 6.0.x
-    stream: 6.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
-
 - project:
     name: yangtools-release-management
     jobs:
@@ -141,10 +112,10 @@
     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}"