From afc5f38174a63420a7c5af14a61594df200caa79 Mon Sep 17 00:00:00 2001 From: Srinivas Rachakonda Date: Thu, 13 Aug 2020 23:16:39 +0530 Subject: [PATCH] Updating master branch to silicon Signed-off-by: Srinivas Rachakonda Change-Id: Icbdbd5b23f48260b971c0f149ef5433f24c04f84 --- .../netvirt-csit-hwvtep-openstack.yaml | 28 ++-- .../netvirt-csit-multi-openstack-upgrade.yaml | 14 +- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 125 +++++++++++++++--- 3 files changed, 124 insertions(+), 43 deletions(-) diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index dfb265236..ee9823ac4 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,11 +1,10 @@ --- - project: - name: netvirt-csit-hwvtep-openstack-integration-aluminium-rocky + name: netvirt-csit-hwvtep-openstack-integration-silicon-rocky jobs: - inttest-csit-hwvtep-openstack-custom - project: "netvirt" - stream: "aluminium" + stream: "silicon" branch: "master" jre: "openjdk11" testplan: "{project}-{topology}-l2gw-openstack.txt" @@ -51,12 +50,12 @@ openstack_system2_image: "{openstack_rocky_system_image}" - project: - name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein + name: netvirt-csit-hwvtep-openstack-integration-silicon-stein jobs: - inttest-csit-hwvtep-openstack-custom project: "netvirt" - stream: "aluminium" + stream: "silicon" branch: "master" jre: "openjdk11" testplan: "{project}-{topology}-l2gw-openstack.txt" @@ -102,13 +101,13 @@ openstack_system2_image: "{openstack_stein_system_image}" - project: - name: netvirt-csit-hwvtep-openstack-integration-magnesium-rocky + name: netvirt-csit-hwvtep-openstack-integration-aluminium-stein jobs: - inttest-csit-hwvtep-openstack-custom project: "netvirt" - stream: "magnesium" - branch: "stable/magnesium" + stream: "aluminium" + branch: "stable/aluminium" jre: "openjdk11" testplan: "{project}-{topology}-l2gw-openstack.txt" odl-ml2-driver-version: "v2" @@ -141,17 +140,16 @@ functionality: - upstream-stateful: - schedule: "{schedule-weekly}" + schedule: "{schedule-daily}" - gate-stateful openstack: - - rocky: - openstack-branch: "stable/rocky" - odl-ml2-branch: "stable/rocky" + - stein: + openstack-branch: "stable/stein" + odl-ml2-branch: "stable/stein" odl-ml2-port-binding: "pseudo-agentdb-binding" - openstack_system_image: "{openstack_rocky_system_image}" - openstack_system2_image: "{openstack_rocky_system_image}" - schedule: "{schedule-daily}" + openstack_system_image: "{openstack_stein_system_image}" + openstack_system2_image: "{openstack_stein_system_image}" - project: name: netvirt-csit-hwvtep-openstack-integration-magnesium-stein diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index 35c3f93e6..541bd6b43 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -7,9 +7,6 @@ project: "netvirt" stream: - - magnesium: - branch: "stable/magnesium" - jre: "openjdk11" - sodium: branch: "stable/sodium" @@ -82,10 +79,10 @@ functionality: - upgrade: - schedule: "{schedule-daily}" + schedule: "{schedule-weekly}" - upgrade-snat-conntrack: odl-snat-mode: "conntrack" - schedule: "{schedule-daily}" + schedule: "{schedule-weekly}" openstack: - rocky: @@ -106,6 +103,9 @@ - magnesium: branch: "stable/magnesium" jre: "openjdk11" + - aluminium: + branch: "stable/aluminium" + jre: "openjdk11" testplan: "{project}-{topology}-openstack-upgrade.txt" odl-ml2-driver-version: "v2" @@ -143,14 +143,14 @@ openstack_system2_image: "{openstack_stein_system_image}" - project: - name: netvirt-csit-upgrade-openstack-integration-stein-aluminium + name: netvirt-csit-upgrade-openstack-integration-stein-silicon jobs: - inttest-csit-openstack-custom project: "netvirt" stream: - - aluminium: + - silicon: branch: "master" jre: "openjdk11" diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 5ee6901e9..b4262e377 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" @@ -83,12 +83,12 @@ 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 project: "netvirt" - stream: "aluminium" + stream: "silicon" branch: "master" jre: "openjdk11" testplan: "{project}-{topology}-openstack.txt" @@ -166,13 +166,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" @@ -226,12 +226,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,6 +248,89 @@ 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 + + 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: @@ -400,12 +483,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 +570,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 +648,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 +730,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" @@ -726,12 +809,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,7 +832,7 @@ 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 @@ -765,7 +848,7 @@ os-cmp-cnt: 0 stream: - - aluminium: + - silicon: branch: "master" jre: "openjdk11" -- 2.36.6