X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius.yaml;h=0a5084ddd2b37098b4cecc8c1f277afa45d33083;hb=8e35c48f867df3bbadfb1ee17d86243a473951be;hp=d8ccd698b46ed53ba534a60e2941f8122652d4c4;hpb=a9f381cbab1a288b50a91f23f5bb44ecc0f9783b;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index d8ccd698b..0a5084ddd 100644
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: genius-magnesium
+    name: genius-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -10,18 +10,17 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - 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
+    stream: aluminium
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
     build-timeout: 90
@@ -37,7 +36,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-sodium
+    name: genius-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -46,17 +45,18 @@
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - 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: magnesium
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
     build-timeout: 90
@@ -72,7 +72,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-neon
+    name: genius-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -87,42 +87,10 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/neon'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
-    build-timeout: 90
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
-- project:
-    name: genius-fluorine
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: genius
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
-          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: fluorine
+    stream: sodium
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m'
@@ -146,8 +114,22 @@
     project-name: 'genius'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'genius-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: genius-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: genius
+    project-name: genius
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: genius-view