From 5c178e8176f56a7a09058fbb62a321405cfc7b14 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 15 Jul 2020 12:19:43 +0200 Subject: [PATCH] Add Victoria test bundles Change-Id: Id71a99b13dcd586294fadd6df3d711ccbd539dbb --- .../bundles/focal-victoria-functional.yaml | 113 ++++++++++++++++++ .../bundles/groovy-victoria-functional.yaml | 113 ++++++++++++++++++ src/tests/tests.yaml | 4 +- 3 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 src/tests/bundles/focal-victoria-functional.yaml create mode 100644 src/tests/bundles/groovy-victoria-functional.yaml diff --git a/src/tests/bundles/focal-victoria-functional.yaml b/src/tests/bundles/focal-victoria-functional.yaml new file mode 100644 index 0000000..fab5394 --- /dev/null +++ b/src/tests/bundles/focal-victoria-functional.yaml @@ -0,0 +1,113 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-victoria + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + # for quagga which has no focal support yet + series: bionic + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + haproxy-server-timeout: 90000 + haproxy-client-timeout: 90000 + haproxy-queue-timeout: 9000 + haproxy-connect-timeout: 9000 + to: + - '3' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + neutron-plugin: ovs + flat-network-providers: physnet1, + neutron-security-groups: true + openstack-origin: *openstack-origin + haproxy-server-timeout: 90000 + haproxy-client-timeout: 90000 + haproxy-queue-timeout: 9000 + haproxy-connect-timeout: 9000 + to: + - '4' + + neutron-dynamic-routing: + charm: ../../../neutron-dynamic-routing + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '5' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '6' + + quagga: + charm: cs:~openstack-charmers-next/bionic/quagga + series: bionic + num_units: 1 + to: + - '7' + +relations: + + - - 'neutron-dynamic-routing:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-dynamic-routing:bgp-speaker' + - 'quagga:bgpclient' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' diff --git a/src/tests/bundles/groovy-victoria-functional.yaml b/src/tests/bundles/groovy-victoria-functional.yaml new file mode 100644 index 0000000..503d618 --- /dev/null +++ b/src/tests/bundles/groovy-victoria-functional.yaml @@ -0,0 +1,113 @@ +variables: + openstack-origin: &openstack-origin distro + +series: groovy + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + # for quagga which has no focal/groovy support yet + series: bionic + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + haproxy-server-timeout: 90000 + haproxy-client-timeout: 90000 + haproxy-queue-timeout: 9000 + haproxy-connect-timeout: 9000 + to: + - '3' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + neutron-plugin: ovs + flat-network-providers: physnet1, + neutron-security-groups: true + openstack-origin: *openstack-origin + haproxy-server-timeout: 90000 + haproxy-client-timeout: 90000 + haproxy-queue-timeout: 9000 + haproxy-connect-timeout: 9000 + to: + - '4' + + neutron-dynamic-routing: + charm: ../../../neutron-dynamic-routing + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '5' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '6' + + quagga: + charm: cs:~openstack-charmers-next/bionic/quagga + series: bionic + num_units: 1 + to: + - '7' + +relations: + + - - 'neutron-dynamic-routing:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-dynamic-routing:bgp-speaker' + - 'quagga:bgpclient' + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api:amqp' + - 'rabbitmq-server:amqp' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 74c7d2d..4d18e43 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -2,6 +2,8 @@ charm_name: neutron-dynamic-routing configure: - zaza.openstack.charm_tests.dragent.configure.setup dev_bundles: +- groovy-victoria-functional +- focal-victoria-functional gate_bundles: - focal-ussuri-functional - bionic-ussuri-functional @@ -17,4 +19,4 @@ tests: - zaza.openstack.charm_tests.dragent.tests.DRAgentTest tests_options: force_deploy: - - focal-ussuri-functional + - groovy-victoria-functional