X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fodlparent%2Fodlparent.yaml;h=599d0438561ec3bcf70a1a8531d964f8b46e3c6a;hb=6bfc1211fbafcae3ec17466f94474ac726235bd2;hp=ae5374bb374b4e0c50f99c520eb5161affd6990a;hpb=5ebddcf2516fc40a8ff5861ad85da0ca6206cef0;p=releng%2Fbuilder.git

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index ae5374bb3..599d04385 100644
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,8 +2,7 @@
 - project:
     name: odlparent-master
     jobs:
-      - 'gerrit-release-merge'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
@@ -18,20 +17,19 @@
     stream: master
     branch: master
 
-    java-version: 'openjdk11'
+    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
@@ -39,7 +37,7 @@
 - project:
     name: odlparent-6.0.x
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
@@ -54,20 +52,20 @@
     stream: 6.0.x
     branch: 6.0.x
 
-    java-version: 'openjdk11'
+    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
     staging-profile-id: 880d5ac25eaa
@@ -75,7 +73,7 @@
 - project:
     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
@@ -86,51 +84,32 @@
     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
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-4.0.x
+    name: odlparent-release-management
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
+      - gerrit-release-merge
 
     project: odlparent
     project-name: odlparent
-    stream: 4.0.x
-    branch: 4.0.x
 
+    build-node: centos7-builder-2c-1g
     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-sonar
@@ -140,12 +119,25 @@
             -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'
+    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