From 827dda5cb44e3072dda279edb3c9501928cec0f7 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 25 Jan 2022 15:34:15 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I47ab7533012a977ecda2e9b87ae8a09304ee24c7 --- charmcraft.yaml | 13 ++ metadata.yaml | 1 + osci.yaml | 10 +- src/config.yaml | 2 + src/metadata.yaml | 3 - src/tests/bundles/bionic-queens.yaml | 125 ------------------ src/tests/bundles/bionic-rocky.yaml | 125 ------------------ src/tests/bundles/bionic-stein.yaml | 125 ------------------ src/tests/bundles/bionic-train.yaml | 125 ------------------ src/tests/bundles/bionic-ussuri.yaml | 125 ------------------ src/tests/bundles/focal-ussuri.yaml | 172 ------------------------- src/tests/bundles/focal-victoria.yaml | 172 ------------------------- src/tests/bundles/focal-wallaby.yaml | 172 ------------------------- src/tests/bundles/focal-xena.yaml | 32 +++-- src/tests/bundles/focal-yoga.yaml | 32 +++-- src/tests/bundles/hirsute-wallaby.yaml | 172 ------------------------- src/tests/bundles/impish-xena.yaml | 32 +++-- src/tests/bundles/jammy-yoga.yaml | 32 +++-- src/tests/tests.yaml | 11 +- 19 files changed, 104 insertions(+), 1377 deletions(-) create mode 100644 charmcraft.yaml create mode 120000 metadata.yaml delete mode 100644 src/tests/bundles/bionic-queens.yaml delete mode 100644 src/tests/bundles/bionic-rocky.yaml delete mode 100644 src/tests/bundles/bionic-stein.yaml delete mode 100644 src/tests/bundles/bionic-train.yaml delete mode 100644 src/tests/bundles/bionic-ussuri.yaml delete mode 100644 src/tests/bundles/focal-ussuri.yaml delete mode 100644 src/tests/bundles/focal-victoria.yaml delete mode 100644 src/tests/bundles/focal-wallaby.yaml delete mode 100644 src/tests/bundles/hirsute-wallaby.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..a850351 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,13 @@ +type: charm + +parts: + charm: + source: src/ + plugin: reactive + build-snaps: [charm] + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index 8785036..7fbff08 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,13 +1,9 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs - - charm-queens-functional-jobs + - charm-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: aodh diff --git a/src/config.yaml b/src/config.yaml index ef64c5b..01f4515 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -21,3 +21,5 @@ options: type: string description: | Comma separated list of nagios servicegroups for the service checks. + openstack-origin: + default: yoga diff --git a/src/metadata.yaml b/src/metadata.yaml index f95d0d6..2033e5c 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -13,10 +13,7 @@ description: | tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish subordinate: false requires: diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 2b73276..0000000 --- a/src/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,125 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: {} - 12: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - aodh: - series: *series - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '5' - - '6' - - '7' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '12' - nrpe: - charm: cs:nrpe -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'aodh:shared-db' - - 'percona-cluster:shared-db' - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 2f1be38..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,125 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-rocky - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: {} - 12: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - aodh: - series: *series - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '5' - - '6' - - '7' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '12' - nrpe: - charm: cs:nrpe -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'aodh:shared-db' - - 'percona-cluster:shared-db' - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 5bb667c..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,125 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-stein - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: {} - 12: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - aodh: - series: *series - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '5' - - '6' - - '7' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '12' - nrpe: - charm: cs:nrpe -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'aodh:shared-db' - - 'percona-cluster:shared-db' - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index 3c81c67..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,125 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-train - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: {} - 11: {} - 12: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - aodh: - series: *series - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '5' - - '6' - - '7' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '12' - nrpe: - charm: cs:nrpe -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'aodh:shared-db' - - 'percona-cluster:shared-db' - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index e3889ba..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,125 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-ussuri - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: - 2: - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - aodh: - series: *series - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '5' - - '6' - - '7' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '8' - - '9' - - '10' - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '12' - nrpe: - charm: cs:nrpe -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'aodh:shared-db' - - 'percona-cluster:shared-db' - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - 'gnocchi:shared-db' - - 'percona-cluster:shared-db' - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index e312ae1..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,172 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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' - - aodh: - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '7' - - '8' - - '9' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '10' - - '11' - - '12' - - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # Note that holding memcached at bionic as it's not available at focal yet. - series: bionic - to: - - '14' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'aodh:shared-db' - - 'aodh-mysql-router:shared-db' - - - 'aodh-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 21d5ddd..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,172 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: - 4: - 5: - 6: - 7: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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' - - aodh: - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '7' - - '8' - - '9' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '10' - - '11' - - '12' - - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # Note that holding memcached at bionic as it's not available at focal yet. - series: bionic - to: - - '14' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'aodh:shared-db' - - 'aodh-mysql-router:shared-db' - - - 'aodh-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 245e701..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,172 +0,0 @@ -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: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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' - - aodh: - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '7' - - '8' - - '9' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '10' - - '11' - - '12' - - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # Note that holding memcached at bionic as it's not available at focal yet. - series: bionic - to: - - '14' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'aodh:shared-db' - - 'aodh-mysql-router:shared-db' - - - 'aodh-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 8a5f2be..e11f425 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -29,14 +29,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge gnocchi-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -44,6 +47,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge aodh: charm: ../../../aodh @@ -54,31 +58,34 @@ applications: - '3' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -88,9 +95,10 @@ applications: - '7' - '8' - '9' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -100,17 +108,19 @@ applications: - '10' - '11' - '12' + channel: latest/edge gnocchi: - charm: cs:~openstack-charmers-next/gnocchi + charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # Note that holding memcached at bionic as it's not available at focal yet. series: bionic diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index bb125aa..17e4af8 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -29,14 +29,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge gnocchi-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -44,6 +47,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge aodh: charm: ../../../aodh @@ -54,31 +58,34 @@ applications: - '3' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -88,9 +95,10 @@ applications: - '7' - '8' - '9' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -100,17 +108,19 @@ applications: - '10' - '11' - '12' + channel: latest/edge gnocchi: - charm: cs:~openstack-charmers-next/gnocchi + charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # Note that holding memcached at bionic as it's not available at focal yet. series: bionic diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index d897218..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,172 +0,0 @@ -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: - 8: - 9: - 10: - 11: - 12: - 13: - 14: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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' - - aodh: - charm: ../../../aodh - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '7' - - '8' - - '9' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '10' - - '11' - - '12' - - gnocchi: - charm: cs:~openstack-charmers-next/gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # Note that holding memcached at bionic as it's not available at focal yet. - series: bionic - to: - - '14' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'aodh:shared-db' - - 'aodh-mysql-router:shared-db' - - - 'aodh-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'aodh:amqp' - - 'rabbitmq-server:amqp' - - - - 'aodh:identity-service' - - 'keystone:identity-service' - - - - 'ceilometer:amqp' - - 'rabbitmq-server:amqp' - - - - 'ceilometer:identity-credentials' - - 'keystone:identity-credentials' - - - - 'ceilometer:identity-notifications' - - 'keystone:identity-notifications' - - - - 'ceilometer:metric-service' - - 'gnocchi:metric-service' - - - - 'gnocchi:identity-service' - - 'keystone:identity-service' - - - - 'gnocchi:shared-db' - - 'gnocchi-mysql-router:shared-db' - - - 'gnocchi-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'gnocchi:storage-ceph' - - 'ceph-mon:client' - - - - 'gnocchi:coordinator-memcached' - - 'memcached:cache' - - - - 'aodh:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index bef3b7c..6587f3e 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -29,14 +29,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge gnocchi-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -44,6 +47,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge aodh: charm: ../../../aodh @@ -54,31 +58,34 @@ applications: - '3' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -88,9 +95,10 @@ applications: - '7' - '8' - '9' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -100,17 +108,19 @@ applications: - '10' - '11' - '12' + channel: latest/edge gnocchi: - charm: cs:~openstack-charmers-next/gnocchi + charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # Note that holding memcached at bionic as it's not available at focal yet. series: bionic diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 74ab4cd..793d32b 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -29,14 +29,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge aodh-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge gnocchi-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -44,6 +47,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge aodh: charm: ../../../aodh @@ -54,31 +58,34 @@ applications: - '3' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '4' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -88,9 +95,10 @@ applications: - '7' - '8' - '9' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -100,17 +108,19 @@ applications: - '10' - '11' - '12' + channel: latest/edge gnocchi: - charm: cs:~openstack-charmers-next/gnocchi + charm: ch:gnocchi num_units: 1 options: openstack-origin: *openstack-origin to: - '13' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # Note that holding memcached at bionic as it's not available at focal yet. series: bionic diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index c69e374..f0bba98 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,21 +1,13 @@ charm_name: aodh gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: - - bionic-train - focal-yoga - jammy-yoga smoke_bundles: - - focal-ussuri + - focal-xena tests: - zaza.openstack.charm_tests.aodh.tests.AodhTest configure: @@ -32,6 +24,5 @@ target_deploy_status: workload-status-message: "Nagios server not configured or related" tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga