Merge "Remove odlparent-6.0.x jobs"

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index e94a0e0627c3bfa5ce29ceeae5a55a2f0385d3db..ecd705ec2f4da83769dc86d071c4bf6e033f185f 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: genius-silicon
+    name: genius-master
     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: master
     project: "genius"
     project-name: "genius"
     branch: "master"
@@ -30,7 +26,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
@@ -48,9 +46,6 @@
       - 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"
@@ -66,78 +61,9 @@
       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
-    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
-
-    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"
-    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-sodium
-    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
-
-    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"
-    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]"
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee