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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 0a5084ddd..e86ee2c5c 100644
--- 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,25 +12,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: silicon
+    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
+    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-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
 
     stream: aluminium
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
+    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
@@ -38,9 +68,9 @@
 - project:
     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/
@@ -48,25 +78,22 @@
       - 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'
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/magnesium"
     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
@@ -74,9 +101,9 @@
 - project:
     name: genius-sodium
     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/
@@ -84,24 +111,21 @@
       - odl-maven-jobs
       - 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'
+    project: "genius"
+    project-name: "genius"
+    branch: "stable/sodium"
     build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    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,17 +134,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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: genius-info