From 099e195e9ee919792d7eaebae8b8b225b004a7ed Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Tue, 7 Jul 2020 15:37:58 +0200 Subject: [PATCH] Add Victoria test bundles Change-Id: Ibb0bd976463c8c88eaf6f577af4399452ebe24a7 --- src/tests/bundles/focal-victoria.yaml | 74 ++++++++++++++++++++++++++ src/tests/bundles/groovy-victoria.yaml | 74 ++++++++++++++++++++++++++ src/tests/tests.yaml | 6 +++ 3 files changed, 154 insertions(+) create mode 100644 src/tests/bundles/focal-victoria.yaml create mode 100644 src/tests/bundles/groovy-victoria.yaml diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml new file mode 100644 index 0000000..3e0ae93 --- /dev/null +++ b/src/tests/bundles/focal-victoria.yaml @@ -0,0 +1,74 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-victoria + +series: &series focal + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + barbican-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 + to: + - '3' + + barbican: + series: *series + charm: ../../../barbican + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: true + to: + - '4' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '5' + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'barbican:shared-db' + - 'barbican-mysql-router:shared-db' + - - 'barbican-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'barbican:identity-service' + + - - 'rabbitmq-server:amqp' + - 'barbican:amqp' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml new file mode 100644 index 0000000..738ccc0 --- /dev/null +++ b/src/tests/bundles/groovy-victoria.yaml @@ -0,0 +1,74 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series groovy + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + barbican-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 + to: + - '3' + + barbican: + series: *series + charm: ../../../barbican + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: true + to: + - '4' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '5' + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'barbican:shared-db' + - 'barbican-mysql-router:shared-db' + - - 'barbican-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'barbican:identity-service' + + - - 'rabbitmq-server:amqp' + - 'barbican:amqp' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index bfa2df2..1e3c963 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -7,5 +7,11 @@ gate_bundles: - bionic-train - bionic-stein - bionic-rocky +dev_bundles: +- groovy-victoria +- focal-victoria tests: - zaza.openstack.charm_tests.barbican.tests.BarbicanTest +tests_options: + force_deploy: + - groovy-victoria