X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=1d9e896356e504be60cd0ff2389d41dc05020ea2;hb=refs%2Fchanges%2F60%2F95560%2F1;hp=4d2b6cfdbe1605ca7e9077dcf8843048c94d5b74;hpb=10284e6a32a842c5f7b74ac75af2127ab3493b8d;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 4d2b6cfdb..1d9e89635 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,9 +2,7 @@
 - project:
     name: controller-master
     jobs:
-      - 'gerrit-release-merge':
-          build-node: centos7-builder-2c-2g
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
@@ -13,26 +11,25 @@
       - odl-maven-verify-jobs
 
     stream: master
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
+    project: "controller"
+    project-name: "controller"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
     mvn-version: mvn36
-    mvn-goals: 'clean deploy -Pdocs'
-    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
+    mvn-goals: "clean deploy -Pdocs"
+    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-magnesium
+    name: controller-3.0.x
     jobs:
-      - '{project-name}-distribution-check-{stream}':
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
@@ -40,69 +37,119 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/magnesium'
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
+    stream: 3.0.x
+    project: "controller"
+    project-name: "controller"
+    branch: "3.0.x"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-version: mvn36
+    mvn-goals: "clean deploy -Pdocs"
+    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-sodium
+    name: controller-2.0.x
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/sodium'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    stream: 2.0.x
+    project: "controller"
+    project-name: "controller"
+    branch: "2.0.x"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-version: mvn36
+    mvn-goals: "clean deploy -Pdocs"
+    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
+    build-timeout: 90
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
+
+    # Used by the release job
+    staging-profile-id: 96c1c9177efdd
+
+- project:
+    name: controller-magnesium
+    jobs:
+      - "{project-name}-distribution-check-{stream}":
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: controller
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/
+          rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: magnesium
+    project: "controller"
+    project-name: "controller"
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
     build-node: centos7-builder-8c-8g
     build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
+    email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
+- project:
+    name: controller-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: controller
+    project-name: controller
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: controller-settings
+
 - project:
     name: controller-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: 'controller'
-    project-name: 'controller'
+    project: "controller"
+    project-name: "controller"
     branch: master
-    build-node: centos7-builder-8c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
+    java-version: "openjdk11"
+    mvn-settings: "controller-settings"
+    mvn-goals: "clean deploy -Pintegrationtests,docs"
+    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+
+- project:
+    name: controller-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: controller
+    project-name: controller
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: controller-view