From 39a40e54a4898ecf0a0043ca8d15302fc15a68f7 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 27 Aug 2019 17:39:40 -0400 Subject: [PATCH 1/1] Resolve yamllint issues Change-Id: If4796489165a32a7a5a0f4517c39ffb5832b3ab5 Signed-off-by: Thanh Ha --- .../netvirt-csit-hwvtep-openstack.yaml | 188 +++++++++--------- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 164 +++++++-------- 2 files changed, 176 insertions(+), 176 deletions(-) diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 0feba39c2..0d01ff951 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -1,101 +1,101 @@ --- - project: - name: netvirt-csit-hwvtep-openstack-integration-magnesium - jobs: - - inttest-csit-hwvtep-openstack-custom - - project: 'netvirt' - stream: 'magnesium' - branch: 'master' - 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-8 - 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,decanter-collector-jmx,decanter-appender-elasticsearch' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - functionality: - - upstream-stateful - - 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}' + name: netvirt-csit-hwvtep-openstack-integration-magnesium + jobs: + - inttest-csit-hwvtep-openstack-custom + + project: 'netvirt' + stream: 'magnesium' + branch: 'master' + 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-8 + 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,decanter-collector-jmx,decanter-appender-elasticsearch' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + + functionality: + - upstream-stateful + - 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-sodium - 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-8 - 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,decanter-collector-jmx,decanter-appender-elasticsearch' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - functionality: - - upstream-stateful - - 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}' + name: netvirt-csit-hwvtep-openstack-integration-sodium + 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-8 + 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,decanter-collector-jmx,decanter-appender-elasticsearch' + - 3node: + openstack_system2_count: 3 + odl_system_count: 3 + enable-haproxy: 'yes' + install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + + functionality: + - upstream-stateful + - 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-neon diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 94ea74246..fbd6f88cf 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -1,91 +1,91 @@ --- - project: - name: netvirt-csit-openstack-integration-magnesium - jobs: - - inttest-csit-openstack-custom + name: netvirt-csit-openstack-integration-magnesium + jobs: + - inttest-csit-openstack-custom - project: 'netvirt' - stream: 'magnesium' - branch: 'master' - 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 + project: 'netvirt' + stream: 'magnesium' + branch: 'master' + 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,decanter-collector-jmx,decanter-appender-elasticsearch' - 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,decanter-collector-jmx,decanter-appender-elasticsearch' + topology: + - 1node: + openstack_system2_count: 2 + odl_system_count: 1 + enable-haproxy: 'no' + install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + 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,decanter-collector-jmx,decanter-appender-elasticsearch' - 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' + 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}' - - 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: + - 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}' - project: name: netvirt-csit-openstack-integration-sodium -- 2.36.6