From d4af9785f6e7a7d3b15e6a0a36d7906d86c605b4 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 15 Jul 2020 12:10:11 +0200 Subject: [PATCH] Add Victoria test bundles Change-Id: I820ccdda90e15b4dd8bcc711cdb8d72589c134c2 --- tests/bundles/focal-victoria.yaml | 121 +++++++++++++++++++++++++++++ tests/bundles/groovy-victoria.yaml | 121 +++++++++++++++++++++++++++++ tests/tests.yaml | 5 +- 3 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 tests/bundles/focal-victoria.yaml create mode 100644 tests/bundles/groovy-victoria.yaml diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml new file mode 100644 index 0000000..913b1f3 --- /dev/null +++ b/tests/bundles/focal-victoria.yaml @@ -0,0 +1,121 @@ +variables: + source: &source cloud:focal-victoria + +series: focal + +comment: + - 'machines section to decide order of deployment. database sooner = faster' + +machines: + '0': + '1': + '2': + '3': + '4': + '5': + '6': + '7': + '8': + constraints: "mem=2048" + '9': + constraints: "mem=2048" + '10': + constraints: "mem=2048" + '11': + '12': + '13': + + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-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: *source + to: + - '0' + - '1' + - '2' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *source + to: + - '4' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *source + to: + - '5' + + glance-simplestreams-sync: + charm: ../../glance-simplestreams-sync + num_units: 1 + to: + - '6' + + ceph-radosgw: + charm: cs:~openstack-charmers-next/ceph-radosgw + num_units: 1 + options: + source: *source + to: + - '7' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: 'cinder,10G' + options: + source: *source + to: + - '8' + - '9' + - '10' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *source + to: + - '11' + - '12' + - '13' + +relations: + - ['keystone:certificates', 'vault:certificates'] + - ['glance:certificates', 'vault:certificates'] + - ['glance-simplestreams-sync:certificates', 'vault:certificates'] + - ['glance:identity-service', 'keystone:identity-service'] + - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service'] + - ['keystone:shared-db','keystone-mysql-router:shared-db'] + - ['glance:shared-db','glance-mysql-router:shared-db'] + - ['vault:shared-db','vault-mysql-router:shared-db'] + - ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router'] + - ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router'] + - ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router'] + - ['ceph-osd:mon', 'ceph-mon:osd'] + - ['ceph-radosgw:mon', 'ceph-mon:radosgw'] + - ['ceph-radosgw:identity-service', 'keystone:identity-service'] + - ['ceph-radosgw:certificates', 'vault:certificates'] diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml new file mode 100644 index 0000000..7654aec --- /dev/null +++ b/tests/bundles/groovy-victoria.yaml @@ -0,0 +1,121 @@ +variables: + source: &source distro + +series: groovy + +comment: + - 'machines section to decide order of deployment. database sooner = faster' + +machines: + '0': + '1': + '2': + '3': + '4': + '5': + '6': + '7': + '8': + constraints: "mem=2048" + '9': + constraints: "mem=2048" + '10': + constraints: "mem=2048" + '11': + '12': + '13': + + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-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: *source + to: + - '0' + - '1' + - '2' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *source + to: + - '4' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *source + to: + - '5' + + glance-simplestreams-sync: + charm: ../../glance-simplestreams-sync + num_units: 1 + to: + - '6' + + ceph-radosgw: + charm: cs:~openstack-charmers-next/ceph-radosgw + num_units: 1 + options: + source: *source + to: + - '7' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: 'cinder,10G' + options: + source: *source + to: + - '8' + - '9' + - '10' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + source: *source + to: + - '11' + - '12' + - '13' + +relations: + - ['keystone:certificates', 'vault:certificates'] + - ['glance:certificates', 'vault:certificates'] + - ['glance-simplestreams-sync:certificates', 'vault:certificates'] + - ['glance:identity-service', 'keystone:identity-service'] + - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service'] + - ['keystone:shared-db','keystone-mysql-router:shared-db'] + - ['glance:shared-db','glance-mysql-router:shared-db'] + - ['vault:shared-db','vault-mysql-router:shared-db'] + - ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router'] + - ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router'] + - ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router'] + - ['ceph-osd:mon', 'ceph-mon:osd'] + - ['ceph-radosgw:mon', 'ceph-mon:radosgw'] + - ['ceph-radosgw:identity-service', 'keystone:identity-service'] + - ['ceph-radosgw:certificates', 'vault:certificates'] diff --git a/tests/tests.yaml b/tests/tests.yaml index 172e5ac..f811b82 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -17,7 +17,7 @@ gate_bundles: tests_options: force_deploy: - - focal-ussuri + - groovy-victoria # functest-run-suite --smoke ... # functest-deploy --bundle /path/to/smoke/bundle @@ -29,7 +29,8 @@ smoke_bundles: # functest-deploy --bundle /path/to/dev/bundle # smoke bundle should be (Ubuntu LTS latest)-(OpenStack development) dev_bundles: - - focal-ussuri + - focal-victoria + - groovy-victoria # special target deploy status for above deploy phase target_deploy_status: