From 7e661b5308bc6ad236f0c9498eddd1f8be3e707f Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 5 Mar 2021 14:01:25 +0000 Subject: [PATCH] Test bundles for focal-wallaby and hirsute-wallaby These are the test bundles (and any associated changes) for focal-wallaby and hirsute-wallaby support. Change-Id: I6d21ce67b7d85811dc6b7f800ee5367a71fc3b98 Co-authored-by: Aurelien Lourot (cherry picked from commit c134578bbc8933ebcfca34966f33b9ac4161b441) --- osci.yaml | 16 ++- .../bundles/focal-wallaby-functional.yaml | 113 ++++++++++++++++++ .../bundles/hirsute-wallaby-functional.yaml | 113 ++++++++++++++++++ src/tests/tests.yaml | 10 +- 4 files changed, 250 insertions(+), 2 deletions(-) create mode 100644 src/tests/bundles/focal-wallaby-functional.yaml create mode 100644 src/tests/bundles/hirsute-wallaby-functional.yaml diff --git a/osci.yaml b/osci.yaml index f377bd7..59a3a58 100644 --- a/osci.yaml +++ b/osci.yaml @@ -3,7 +3,9 @@ - charm-unit-jobs check: jobs: + - hirsute-wallaby-functional - groovy-victoria-functional + - focal-wallaby-functional - focal-victoria-functional - focal-ussuri-functional - bionic-ussuri-functional @@ -16,12 +18,24 @@ - job: - name: groovy-victoria-functional + name: hirsute-wallaby-functional parent: func-target dependencies: &smoke-jobs - bionic-ussuri-functional + vars: + tox_extra_args: hirsute-wallaby-functional +- job: + name: groovy-victoria-functional + parent: func-target + dependencies: *smoke-jobs vars: tox_extra_args: groovy-victoria-functional +- job: + name: focal-wallaby-functional + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: focal-wallaby-functional - job: name: focal-victoria-functional parent: func-target diff --git a/src/tests/bundles/focal-wallaby-functional.yaml b/src/tests/bundles/focal-wallaby-functional.yaml new file mode 100644 index 0000000..de47786 --- /dev/null +++ b/src/tests/bundles/focal-wallaby-functional.yaml @@ -0,0 +1,113 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +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/hirsute-wallaby-functional.yaml b/src/tests/bundles/hirsute-wallaby-functional.yaml new file mode 100644 index 0000000..6edaa1b --- /dev/null +++ b/src/tests/bundles/hirsute-wallaby-functional.yaml @@ -0,0 +1,113 @@ +variables: + openstack-origin: &openstack-origin distro + +series: hirsute + +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/hirsute 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 1fdd9c0..6a6182c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,22 +1,30 @@ charm_name: neutron-dynamic-routing + configure: - zaza.openstack.charm_tests.dragent.configure.setup + gate_bundles: - groovy-victoria-functional +- focal-wallaby-functional - focal-victoria-functional - focal-ussuri-functional - bionic-ussuri-functional - bionic-train-functional - bionic-stein-functional - bionic-queens-functional + smoke_bundles: - bionic-train-functional + dev_bundles: - xenial-pike-functional - xenial-queens-functional - bionic-rocky-functional +- hirsute-wallaby-functional + tests: - zaza.openstack.charm_tests.dragent.tests.DRAgentTest + tests_options: force_deploy: - - groovy-victoria-functional + - hirsute-wallaby-functional