Merge "Move odlparent Sonar scan to Sonarcloud"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 20bc4533d1befb9f439972ce7a340f5c43de7d7e..422729ebb75fba3b65bd109b8d5f17d3bb124447 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,16 +2,19 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -27,18 +30,18 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.1.x
+    name: yangtools-4.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v2.1.x
-    stream: v2.1.x
+    branch: 4.0.x
+    stream: 4.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -54,15 +57,15 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.0.x
+    name: yangtools-v3.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
-    branch: v2.0.x
-    stream: v2.0.x
+    branch: v3.0.x
+    stream: v3.0.x
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
@@ -92,6 +95,7 @@
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'