X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=b2ecd102e52749d9072c8c47117f3de9f80d5cb4;hb=769e949ea29cfa694c52df91e77beb0863972e29;hp=42d29a30340462645a6f2f1275b5af62a646b6a5;hpb=2f4ae53007f25fc669359f416cce2a01e78a3503;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 42d29a303..b2ecd102e 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,16 +2,16 @@
 - project:
     name: odlparent-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -19,9 +19,9 @@
     stream: master
     branch: master
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-    mvn-version: mvn35
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -37,18 +37,24 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-5.0.x
+    name: odlparent-6.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
-    stream: 5.0.x
-    branch: 5.0.x
+    stream: 6.0.x
+    branch: 6.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'
     mvn-version: mvn35
@@ -67,37 +73,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-4.0.x
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 4.0.x
-    branch: 4.0.x
-
-    mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    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
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
-    staging-profile-id: 880d5ac25eaa
-
-- project:
-    name: odlparent-3.1.x
+    name: odlparent-5.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -106,11 +82,12 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
+    stream: 5.0.x
+    branch: 5.0.x
 
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -123,14 +100,12 @@
         **/target/feature/feature.xml
 
     # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
     name: odlparent-sonar
     jobs:
       - gerrit-maven-sonar:
-          java-version: openjdk11
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
@@ -138,8 +113,22 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'odlparent-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: odlparent-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: odlparent
+    project-name: odlparent
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: odlparent-view