X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyangtools%2Fyangtools.yaml;h=d02900bbab7eed7d8ed977d21ec2f17f568fc659;hb=dea65f1fae77649063d7d21645ae7e56e05e112e;hp=afa40b3e76bb5068cd377431c313865fbab6f3ae;hpb=884dd2396247ac74162d118a5654b655efd50f48;p=releng%2Fbuilder.git

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index afa40b3e7..d02900bba 100644
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,18 +2,19 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     project: yangtools
     project-name: yangtools
     branch: master
     stream: master
 
+    java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -29,45 +30,18 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v3.0.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: v3.0.x
-    stream: v3.0.x
-
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
-
-    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-v2.1.x
+    name: yangtools-4.0.x
     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]'
@@ -83,15 +57,15 @@
     staging-profile-id: 1271cf710cc09d
 
 - project:
-    name: yangtools-v2.0.x
+    name: yangtools-v3.0.x
     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'
@@ -113,7 +87,6 @@
     name: yangtools-sonar
     jobs:
       - gerrit-maven-sonar:
-          java-version: openjdk11
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
@@ -122,8 +95,22 @@
     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}'
+
+- project:
+    name: yangtools-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: yangtools
+    project-name: yangtools
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: yangtools-view