X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=461b078955e2aef09e171f3b1787f9fb8fabb34b;hb=b34abfa907dfdc6474412d72e7b848b1e6986881;hp=84a1f5ed181e794befea8685ba7acf123a143fc8;hpb=626da9115ae3f8607732922655d2696379bb253c;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 84a1f5ed1..461b07895 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,21 +1,21 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-magnesium
+    name: netvirt-csit-openstack-integration-master-rocky
     jobs:
       - inttest-csit-openstack-custom
 
-    project: 'netvirt'
-    stream: 'magnesium'
-    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-8
-    openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    project: "netvirt"
+    stream: "master"
+    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: v3-standard-2
+    openstack_system_flavor: v3-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -25,83 +25,76 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          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'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"
       - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"
       - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"
       - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"
       - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
-          enable-gre-type-driver: 'yes'
+          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}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"
       - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
       - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
       - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          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'
+          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}'
       - 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}'
+          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-openstack-integration-sodium
+    name: netvirt-csit-openstack-integration-master-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-8
+    # temporarily disabling Stein jobs
+    disable-job: true
+    project: "netvirt"
+    stream: "master"
+    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
@@ -113,273 +106,135 @@
       - 1node:
           openstack_system2_count: 2
           odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
+          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'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"
       - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"
       - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"
       - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          testplan: "{project}-{topology}-minimal-openstack.txt"
       - dcgw:
-          testplan: '{project}-{topology}-dcgw-openstack.txt'
+          testplan: "{project}-{topology}-dcgw-openstack.txt"
           tools_system_count: 3
-          enable-gre-type-driver: 'yes'
+          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}'
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
           tools_system_count: 3
-          enable-gre-type-driver: 'yes'
+          enable-gre-type-driver: "yes"
       - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
       - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
       - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          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'
+          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}'
-      - 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}'
+      - 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-openstack-integration-neon
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-master
     jobs:
       - inttest-csit-openstack-custom
 
-    project: 'netvirt'
-    stream: 'neon'
-    branch: 'stable/neon'
-    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-8
-    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'
-      # 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: ''
-          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-sfc-openstack-integration
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: 'netvirt'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-highcpu-4
-    openstack_system2_flavor: odl-highcpu-8
-    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-sfc'
-
-    functionality:
-      - sfc:
-          enable-openstack-services: 'placement-api,tempest'
-          enable-openstack-compute-services: 'placement-client'
-          enable-openstack-plugins: 'networking-odl,networking-sfc'
-          testplan: '{project}-extensions-sfc.txt'
-
-    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}'
-
-    stream:
-      - magnesium:
-          branch: 'master'
-          ovs-install: 'v2.9.2'
-          jre: 'openjdk11'
-      - sodium:
-          branch: 'stable/sodium'
-          ovs-install: 'v2.9.2'
-      - neon:
-          branch: 'stable/neon'
-          ovs-install: 'v2.9.2'
-
-- project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
-    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-8
+    # temporarily disabling Stein jobs
+    disable-job: true
+    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:
-      - sodium:
-          branch: 'master'
-      - neon:
-          branch: 'stable/neon'
+      - master:
+          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'
+          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'
+          enable-haproxy: "yes"
+          install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
       - upstream-stateful
       - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"
       - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"
       - gate-stateful
       - gate-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: 'true'
+          enable-itm-direct-tunnels: "true"
       - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
+          odl-snat-mode: "conntrack"
       - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
+          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: ''
+          testplan: "{project}-{topology}-tdd-wip-openstack.txt"
       - tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
       - tempest-stateful-snat-conntrack:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
-          odl-snat-mode: 'conntrack'
-          schedule: '{schedule-daily}'
+          test-suites: "openstack/tempest/tempest.robot"
+          testplan: "{project}-{topology}-openstack-tempest.txt"
+          odl-snat-mode: "conntrack"
       - gate-tempest-stateful:
-          test-suites: 'openstack/tempest/tempest.robot'
-          testplan: '{project}-{topology}-openstack-tempest.txt'
+          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'
+          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}'
-      - 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}'
+      - 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}"