Merge "Minimize CSIT dependencis in mininet-ovs-2.8 image"

[releng/builder.git] / jjb / genius / genius.yaml

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 1dbc8818c3b717816b2c1276bdc175b639f60cd8..0959fa964816dc3cff22700179fdc075b2ebeaa6 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: genius-aluminium
+    name: genius-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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/
@@ -12,35 +12,32 @@
       - 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: aluminium
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
+    stream: silicon
+    project: "genius"
+    project-name: "genius"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    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]'
+      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-magnesium
+    name: genius-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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/
@@ -48,60 +45,55 @@
       - 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: 'genius'
-    project-name: 'genius'
-    branch: 'stable/magnesium'
+    stream: aluminium
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/aluminium"
     build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    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]'
+      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-sodium
+    name: genius-magnesium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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-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
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/sodium'
+    stream: magnesium
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/magnesium"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    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]'
+      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
@@ -110,13 +102,17 @@
     name: genius-sonar
     jobs:
       - gerrit-maven-sonar
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
+    project: "genius"
+    project-name: "genius"
+    branch: "master"
     build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    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