Merge "Update validate-ar jobs for silicon"

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index e94a0e0627c3bfa5ce29ceeae5a55a2f0385d3db..e901919e9578cc4520e24a416966ca6db2d2cb90 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: genius-silicon
+    name: genius-phosphorus
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -12,10 +11,7 @@
       - 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
+    stream: phosphorus
     project: "genius"
     project-name: "genius"
     branch: "master"
@@ -30,15 +26,16 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-aluminium
+    name: genius-silicon
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -48,13 +45,10 @@
       - 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
+    stream: silicon
     project: "genius"
     project-name: "genius"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "genius-settings"
@@ -66,13 +60,15 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    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"
@@ -84,13 +80,10 @@
       - 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
+    stream: aluminium
     project: "genius"
     project-name: "genius"
-    branch: "stable/magnesium"
+    branch: "stable/aluminium"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "genius-settings"
@@ -102,13 +95,15 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    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"
@@ -117,17 +112,15 @@
           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
@@ -137,7 +130,9 @@
       odlparent-merge-{stream},
       openflowplugin-merge-{stream},
       neutron-merge-{stream}
-    email-upstream: "[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]"
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee