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

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index af147a715..461b07895 100644
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -1,11 +1,11 @@
 ---
 - project:
-    name: netvirt-csit-openstack-integration-silicon-rocky
+    name: netvirt-csit-openstack-integration-master-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -13,8 +13,8 @@
     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
+    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
@@ -54,18 +54,15 @@
       # 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"
@@ -83,13 +80,13 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-silicon-stein
+    name: netvirt-csit-openstack-integration-master-stein
     jobs:
       - inttest-csit-openstack-custom
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
-    stream: "silicon"
+    stream: "master"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -138,275 +135,15 @@
       # 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-openstack-integration-aluminium-rocky
-    jobs:
-      - inttest-csit-openstack-custom
-
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    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-standard-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-weekly}"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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-openstack-integration-aluminium-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
-    disable-job: true
-    project: "netvirt"
-    stream: "aluminium"
-    branch: "stable/aluminium"
-    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-weekly}"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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-openstack-integration-magnesium-stein
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
-    disable-job: true
-    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:
-          schedule: "{schedule-weekly}"
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-          schedule: "{schedule-weekly}"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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
-          schedule: "{schedule-weekly}"
-          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"
@@ -424,90 +161,11 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-rocky
+    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-master
     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:
-      - magnesium:
-          branch: "stable/magnesium"
-          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-weekly}"
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-          schedule: "{schedule-weekly}"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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: ""
-      - tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-weekly}"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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:
-      - inttest-csit-openstack-custom
-
-    #temporarily disabling Stein jobs
+    # temporarily disabling Stein jobs
     disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
@@ -521,88 +179,7 @@
     os-cmp-cnt: 0
 
     stream:
-      - magnesium:
-          branch: "stable/magnesium"
-          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-weekly}"
-      - upstream-stateful-itm-direct-tunnels:
-          enable-itm-direct-tunnels: "true"
-          schedule: "{schedule-weekly}"
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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: ""
-      - tempest-stateful:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-weekly}"
-      - tempest-stateful-snat-conntrack:
-          test-suites: "openstack/tempest/tempest.robot"
-          testplan: "{project}-{topology}-openstack-tempest.txt"
-          odl-snat-mode: "conntrack"
-          schedule: "{schedule-weekly}"
-      - 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-stein-silicon
-    jobs:
-      - inttest-csit-openstack-custom
-
-    #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:
-      - silicon:
+      - master:
           branch: "master"
           jre: "openjdk11"
 
@@ -620,14 +197,11 @@
           install-features: "odl-jolokia,odl-netvirt-openstack"
 
     functionality:
-      - upstream-stateful:
-          schedule: "{schedule-daily}"
+      - upstream-stateful
       - 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"
@@ -639,20 +213,16 @@
           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"