X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fodlparent%2Fodlparent.yaml;h=362650d1abe30d0e53da9e0b1bf144eb0f575c79;hb=b5d6fe038cf731d6681d05a2753c050cc6487ed0;hp=6f19d89e21e4f9649fc607da080285c752fcf31a;hpb=29a6bbfea7f48efaa5c9f92b947e6aaa48658bf6;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 6f19d89e2..362650d1a 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,15 +2,14 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-gerrit-release-jobs'
-      - '{project-name}-rtd-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:
-          java-version:
-            - openjdk11
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -18,123 +17,165 @@
     stream: master
     branch: master
 
+    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-    mvn-version: mvn35
+    mvn-version: mvn36
 
-    dependencies: ''
-    email-upstream: '[odlparent]'
+    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
+      **/*.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
+    name: odlparent-7.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: 7.0.x
+    branch: 7.0.x
 
+    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-    mvn-version: mvn35
+    mvn-version: mvn36
 
-    dependencies: ''
-    email-upstream: '[odlparent]'
+    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
+      **/*.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-4.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: 4.0.x
-    branch: 4.0.x
+    stream: 6.0.x
+    branch: 6.0.x
 
+    java-version: "openjdk11"
     mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
+    mvn-opts: "-Xmx1024m"
+    mvn-version: mvn35
 
-    dependencies: ''
-    email-upstream: '[odlparent]'
+    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
+      **/*.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'
+      - "{project-name}-maven-javadoc-jobs"
       - odl-maven-jobs
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     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-opts: "-Xmx1024m"
+    mvn-version: mvn35
 
-    dependencies: ''
-    email-upstream: '[odlparent]'
+    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
+      **/*.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-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: odlparent
+    project-name: odlparent
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: odlparent-settings
+
 - project:
     name: odlparent-sonar
     jobs:
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
+
+    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: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'master'
-    mvn-settings: 'odlparent-settings'
-    mvn-opts: '-Xmx1024m'
+- 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