X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-multi-openstack.yaml;h=8867dd97b271dcb8f5f570cf209782ed3fa72337;hb=a1cba63548032a33681714b0678d7b248ad810bc;hp=5ee6901e9f1f315957ce3a0621238d47698138e6;hpb=b094d327723da8b0c7d08f1698ef9fa086b7a3f9;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 5ee6901e9f..8867dd97b2 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-aluminium-rocky
+    name: netvirt-csit-openstack-integration-silicon-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "aluminium"
+    stream: "silicon"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -15,7 +15,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -83,12 +83,13 @@
           openstack_system2_image: "{openstack_rocky_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-aluminium-stein
+    name: netvirt-csit-openstack-integration-silicon-stein
     jobs:
       - inttest-csit-openstack-custom
-
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
-    stream: "aluminium"
+    stream: "silicon"
     branch: "master"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
@@ -166,13 +167,13 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-openstack-integration-magnesium-rocky
+    name: netvirt-csit-openstack-integration-aluminium-rocky
     jobs:
       - inttest-csit-openstack-custom
 
     project: "netvirt"
-    stream: "magnesium"
-    branch: "stable/magnesium"
+    stream: "aluminium"
+    branch: "stable/aluminium"
     jre: "openjdk11"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -181,7 +182,7 @@
     security-group-mode: "stateful"
     odl_system_flavor: odl-highcpu-2
     openstack_system_flavor: odl-highcpu-8
-    openstack_system2_flavor: odl-highcpu-4
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 0
     os-cmb-cnt: 0
     os-ctl-cnt: 1
@@ -226,12 +227,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          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-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -248,11 +249,98 @@
           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"
@@ -400,12 +488,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          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-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -487,12 +575,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          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-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -565,12 +653,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          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-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -647,12 +735,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          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-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -674,6 +762,8 @@
     jobs:
       - inttest-csit-openstack-custom
 
+    #temporarily disabling Stein jobs
+    disable-job: true
     project: "netvirt"
     testplan: "{project}-{topology}-openstack.txt"
     odl-ml2-driver-version: "v2"
@@ -726,12 +816,12 @@
       - tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
-          schedule: "{schedule-daily}"
+          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-daily}"
+          schedule: "{schedule-weekly}"
       - gate-tempest-stateful:
           test-suites: "openstack/tempest/tempest.robot"
           testplan: "{project}-{topology}-openstack-tempest.txt"
@@ -749,10 +839,12 @@
           openstack_system2_image: "{openstack_stein_system_image}"
 
 - project:
-    name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration-stein-aluminium
+    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"
@@ -765,7 +857,7 @@
     os-cmp-cnt: 0
 
     stream:
-      - aluminium:
+      - silicon:
           branch: "master"
           jre: "openjdk11"