From 852d0a4d32c23aa1367f19967bcde60833ffd326 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 4 Mar 2021 11:10:10 +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. hisute-wallaby test is disabled (moved to dev) due to [1]. [1] https://github.com/juju-solutions/layer-basic/issues/194 Change-Id: I327cf71fe81a1808b7ca08bd190ee2423f3beff3 --- osci.yaml | 2 +- src/tests/bundles/focal-wallaby.yaml | 126 +++++++++++++++++++++++++ src/tests/bundles/hirsute-wallaby.yaml | 126 +++++++++++++++++++++++++ src/tests/tests.yaml | 4 +- 4 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 src/tests/bundles/focal-wallaby.yaml create mode 100644 src/tests/bundles/hirsute-wallaby.yaml diff --git a/osci.yaml b/osci.yaml index ec18317..63c0e27 100644 --- a/osci.yaml +++ b/osci.yaml @@ -4,4 +4,4 @@ - charm-functional-jobs vars: needs_charm_build: true - charm_build_name: designate \ No newline at end of file + charm_build_name: designate diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml new file mode 100644 index 0000000..4ab3939 --- /dev/null +++ b/src/tests/bundles/focal-wallaby.yaml @@ -0,0 +1,126 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-wallaby + +series: focal + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + series: bionic + '8': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + designate-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' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + to: + - '5' + + designate-bind: + charm: cs:~openstack-charmers-next/designate-bind + num_units: 1 + # NOTE(ajkavanagh) apparently it has no openstack origin! + #options: + #openstack-origin: *openstack-origin + to: + - '6' + + memcached: + charm: cs:~memcached-team/memcached + num_units: 1 + # holding charm at bionic as it isn't available for focal yet + series: bionic + to: + - '7' + + designate: + charm: ../../../designate + num_units: 1 + options: + nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' + openstack-origin: *openstack-origin + to: + - '8' + +relations: + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:shared-db' + - 'designate-mysql-router:shared-db' + - - 'designate-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:amqp' + - 'rabbitmq-server:amqp' + + - - 'designate:identity-service' + - 'keystone:identity-service' + + - - 'designate:dns-backend' + - 'designate-bind:dns-backend' + + - - 'designate:coordinator-memcached' + - 'memcached:cache' + + - - 'designate:dnsaas' + - 'neutron-api:external-dns' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + + - - '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' diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml new file mode 100644 index 0000000..e90546b --- /dev/null +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -0,0 +1,126 @@ +variables: + openstack-origin: &openstack-origin distro + +series: hirsute + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + series: bionic + '8': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + designate-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' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + to: + - '5' + + designate-bind: + charm: cs:~openstack-charmers-next/designate-bind + num_units: 1 + # NOTE(ajkavanagh) apparently it has no openstack origin! + #options: + #openstack-origin: *openstack-origin + to: + - '6' + + memcached: + charm: cs:~memcached-team/memcached + num_units: 1 + # holding charm at bionic as it isn't available for focal/groovy yet + series: bionic + to: + - '7' + + designate: + charm: ../../../designate + num_units: 1 + options: + nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' + openstack-origin: *openstack-origin + to: + - '8' + +relations: + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:shared-db' + - 'designate-mysql-router:shared-db' + - - 'designate-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:amqp' + - 'rabbitmq-server:amqp' + + - - 'designate:identity-service' + - 'keystone:identity-service' + + - - 'designate:dns-backend' + - 'designate-bind:dns-backend' + + - - 'designate:coordinator-memcached' + - 'memcached:cache' + + - - 'designate:dnsaas' + - 'neutron-api:external-dns' + + - - 'neutron-api:identity-service' + - 'keystone:identity-service' + + - - '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' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index a6d8618..924ec5a 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -11,6 +11,7 @@ gate_bundles: - bionic-ussuri - focal-ussuri - focal-victoria + - focal-wallaby - groovy-victoria dev_bundles: @@ -19,10 +20,11 @@ dev_bundles: - xenial-pike - xenial-queens - bionic-rocky + - hirsute-wallaby tests: - zaza.openstack.charm_tests.designate.tests.DesignateTests tests_options: force_deploy: - - groovy-victoria + - hirsute-wallaby