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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index b9fc80aa5..b0f64babd 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,25 +2,56 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
+      - 'gerrit-release-merge'
+      - '{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
 
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
+    java-version: 'openjdk11'
+    mvn-settings: odlparent-settings
+    mvn-opts: '-Xmx1024m'
+    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-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: 5.0.x
+    branch: 5.0.x
+
     mvn-settings: odlparent-settings
-    mvn-goals: clean install
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
+    mvn-opts: '-Xmx1024m'
+    mvn-version: mvn35
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -36,27 +67,20 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-2.0.x
+    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: 2.0.x
-    branch: 2.0.x
-    distribution_branch: master
-
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
+    stream: 4.0.x
+    branch: 4.0.x
+
     mvn-settings: odlparent-settings
-    mvn-goals: clean install
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
+    mvn-opts: '-Xmx1024m'
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -73,27 +97,21 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-carbon
+    name: odlparent-3.1.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
-    stream: carbon
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: odlparent
+    project-name: odlparent
+    stream: 3.1.x
+    branch: 3.1.x
+
+    mvn-settings: odlparent-settings
+    mvn-opts: '-Xmx1024m'
+
     dependencies: ''
     email-upstream: '[odlparent]'
     archive-artifacts: >
@@ -111,11 +129,20 @@
 - 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-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: odlparent-view
+    views:
+      - project-view
+    project-name: odlparent