Reduce Netvirt jobs costs

The changes are as per below combination:

---------------------------------
         | Queens | Rocky |Stein|
---------------------------------
Aluminium|  NA   |  Yes   | Yes |
---------------------------------
Magnesium|  NA   |  Yes   |Yes  |
---------------------------------
Sodium   |  Yes  |  Yes   | NA  |
---------------------------------

Signed-off-by: Srinivas Rachakonda <srinivas.rachakonda@gmail.com>
Change-Id: Icb3f579c5049c2eb096e2cab420a77dbabce2663

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index ab177db688947954765f2313731449c049387819..84f80723fa90773e40b18d6ff228759cb4a9033f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -1,55 +1,4 @@
 ---
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-aluminium-queens
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: 'netvirt'
-    stream: 'aluminium'
-    branch: 'master'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '{schedule-weekly}'
-      - gate-stateful
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky
     jobs:
@@ -152,56 +101,6 @@
           openstack_system_image: '{openstack_stein_system_image}'
           openstack_system2_image: '{openstack_stein_system_image}'
 
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-magnesium-queens
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: 'netvirt'
-    stream: 'magnesium'
-    branch: 'stable/magnesium'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '{schedule-weekly}'
-      - gate-stateful
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky
@@ -307,56 +206,6 @@
           openstack_system2_image: '{openstack_stein_system_image}'
           schedule: '{schedule-weekly}'
 
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-sodium-queens
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20190521-223726.040
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '{schedule-weekly}'
-      - gate-stateful
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-          schedule: '{schedule-weekly}'
 
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-sodium-rocky
@@ -409,53 +258,3 @@
           openstack_system2_image: '{openstack_rocky_system_image}'
           schedule: '{schedule-weekly}'
 
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-sodium-stein
-    jobs:
-      - inttest-csit-hwvtep-openstack-custom
-
-    project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - x86_64 - 20200601-180138.390
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '{schedule-weekly}'
-      - gate-stateful
-
-    openstack:
-      - stein:
-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-          schedule: '{schedule-weekly}'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
index a338ac0097e80dd7f98ddd439dc8f7caaf2b1189..524c4d5443ba88f2382c87ea38087372cb31fb7d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -1,101 +1,4 @@
 ---
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-queens
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-
-    stream:
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-
-    testplan: '{project}-{topology}-openstack-upgrade.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    group-add-mod-enabled: 'true'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-
-    functionality:
-      - upgrade:
-          schedule: '{schedule-weekly}'
-      - upgrade-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-weekly}'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
-
-- project:
-    name: netvirt-csit-upgrade-openstack-integration-queens-aluminium
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-
-    stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-
-    testplan: '{project}-{topology}-openstack-upgrade.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    group-add-mod-enabled: 'true'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-
-    functionality:
-      - upgrade:
-          schedule: '{schedule-daily}'
-      - upgrade-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
 - project:
     name: netvirt-csit-upgrade-openstack-integration-rocky
     jobs:
@@ -204,8 +107,6 @@
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
 
     testplan: '{project}-{topology}-openstack-upgrade.txt'
     odl-ml2-driver-version: 'v2'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 11cbdaa3da5d445b29786e77266da9f4870394c1..1803640852848a3d1759c6ec669a027a923e3b47 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,87 +1,4 @@
 ---
-- project:
-    name: netvirt-csit-openstack-integration-aluminium-queens
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    stream: 'aluminium'
-    branch: 'master'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 0
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-      - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
-      - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-
 - project:
     name: netvirt-csit-openstack-integration-aluminium-rocky
     jobs:
@@ -248,88 +165,6 @@
           openstack_system_image: '{openstack_stein_system_image}'
           openstack_system2_image: '{openstack_stein_system_image}'
 
-- project:
-    name: netvirt-csit-openstack-integration-magnesium-queens
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    stream: 'magnesium'
-    branch: 'stable/magnesium'
-    jre: 'openjdk11'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 0
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-      - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
-      - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
 
 - project:
     name: netvirt-csit-openstack-integration-magnesium-rocky
@@ -675,89 +510,6 @@
           openstack_system_image: '{openstack_rocky_system_image}'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
-- project:
-    name: netvirt-csit-openstack-integration-sodium-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    stream: 'sodium'
-    branch: 'stable/sodium'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
-    tools_system_count: 0
-    os-cmb-cnt: 0
-    os-ctl-cnt: 1
-    os-cmp-cnt: 2
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: '{schedule-weekly}'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-      - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
-      - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - stein:
-          openstack-branch: 'stable/stein'
-          odl-ml2-branch: 'stable/stein'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_stein_system_image}'
-          openstack_system2_image: '{openstack_stein_system_image}'
-
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens
     jobs:
@@ -775,9 +527,6 @@
     os-cmp-cnt: 0
 
     stream:
-      - magnesium:
-          branch: 'stable/magnesium'
-          jre: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
 
@@ -840,91 +589,6 @@
           openstack_system2_image: '{openstack_queens_system_image}'
           schedule: '{schedule-weekly}'
 
-- project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-queens-aluminium
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'n-cpu,placement-api,tempest'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    os-cmb-cnt: 1
-    os-ctl-cnt: 0
-    os-cmp-cnt: 0
-
-    stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 0
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
-      - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '{schedule-daily}'
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-daily}'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-          schedule: '{schedule-daily}'
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
-      - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
-      - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_queens_system_image}'
-          openstack_system2_image: '{openstack_queens_system_image}'
-          schedule: '{schedule-weekly}'
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky
     jobs:
@@ -1006,90 +670,6 @@
           openstack_system_image: '{openstack_rocky_system_image}'
           openstack_system2_image: '{openstack_rocky_system_image}'
 
-- project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky-aluminium
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'n-cpu,placement-api,tempest'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-2
-    openstack_system_flavor: odl-highcpu-8
-    os-cmb-cnt: 1
-    os-ctl-cnt: 0
-    os-cmp-cnt: 0
-
-    stream:
-      - aluminium:
-          branch: 'master'
-          jre: 'openjdk11'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 0
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
-      - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '{schedule-daily}'
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-          schedule: '{schedule-daily}'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-stateful
-      - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-      - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
-          tools_system_count: 3
-          enable-gre-type-driver: 'yes'
-          schedule: '{schedule-daily}'
-      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - gate-tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
-          schedule: ''
-      - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
-      - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
-      - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-      - gate-tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - rocky:
-          openstack-branch: 'stable/rocky'
-          odl-ml2-branch: 'stable/rocky'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_rocky_system_image}'
-          openstack_system2_image: '{openstack_rocky_system_image}'
-
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein
     jobs:
@@ -1110,8 +690,6 @@
       - magnesium:
           branch: 'stable/magnesium'
           jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
 
     topology:
       - 1node: