X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=b2ecd102e52749d9072c8c47117f3de9f80d5cb4;hb=17e405080849c714581eaeb98ad4b20dae1f3ea9;hp=5c89996ce736f8a91e274f12c31dc2ff8d1394c6;hpb=620cd778ceec8f9ce023a93010f47485e8e7fd84;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 5c89996ce..b2ecd102e 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,48 +2,26 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - '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
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
     stream: master
     branch: master
-    distribution_branch: master
-
-    mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn35
-
-    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
-    staging-profile-id: 880d5ac25eaa
-
-- project:
-    name: odlparent-3.1.x
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
-    distribution_branch: master
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn36
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -56,24 +34,30 @@
         **/target/feature/feature.xml
 
     # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.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: 3.0.x
-    branch: 3.0.x
-    distribution_branch: master
+    stream: 6.0.x
+    branch: 6.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -86,24 +70,24 @@
         **/target/feature/feature.xml
 
     # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-2.0.x
+    name: odlparent-5.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
-    stream: 2.0.x
-    branch: 2.0.x
-    distribution_branch: master
+    stream: 5.0.x
+    branch: 5.0.x
 
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -116,16 +100,38 @@
         **/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
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'odlparent-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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
+    views:
+      - project-view
+    project-name: odlparent