X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=f09216bf9ca7260cb2e1315a130ae43163ba65a6;hb=0abaee571f249a9da5396f5d44cae9350f2fbf2a;hp=fbcc00bb268a6f73fd16a1cdccfc08c67300230c;hpb=ebf97a45fa6d937ed300d4235b3eb7776f4876fa;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index fbcc00bb2..f09216bf9 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-magnesium
+    name: openflowplugin-silicon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -16,7 +16,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: silicon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
@@ -37,7 +37,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-sodium
+    name: openflowplugin-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -47,18 +47,56 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
+    stream: aluminium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/sodium'
+    branch: 'stable/aluminium'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    java-version: 'openjdk11'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: 'clean deploy javadoc:aggregate'
+    mvn-opts: '-Xmx1024m'
+    dependencies: >
+        odlparent-merge-{stream},
+        yangtools-merge-{stream},
+        controller-merge-{stream},
+        openflowjava-merge-{stream}
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+
+    # Used by the release job
+    staging-profile-id: a68a76dc1b44c
+
+- project:
+    name: openflowplugin-magnesium
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: openflowplugin
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
+          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: magnesium
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
+    java-version: 'openjdk11'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m'
@@ -73,7 +111,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-neon
+    name: openflowplugin-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -89,10 +127,10 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
+    stream: sodium
     project: 'openflowplugin'
     project-name: 'openflowplugin'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
@@ -122,6 +160,19 @@
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     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: openflowplugin-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: openflowplugin
+    project-name: openflowplugin
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: openflowplugin-view