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 9c48741..887d083 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,25 +1,14 @@ - 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 check: jobs: - - test-s3-bionic-stein-s3 - - test-s3-bionic-train-s3 - - test-s3-bionic-ussuri-s3 - - test-s3-focal-ussuri-s3 - - test-s3-focal-victoria-s3 - - test-s3-focal-wallaby-s3 - test-s3-focal-xena-s3 - test-s3-focal-yoga-s3: voting: false - - test-s3-hirsute-wallaby-s3 - test-s3-impish-xena-s3: voting: false - test-s3-jammy-yoga-s3: @@ -28,70 +17,31 @@ needs_charm_build: true charm_build_name: gnocchi -- job: - name: test-s3-bionic-stein-s3 - parent: func-target - dependencies: &smoke-jobs - - focal-ussuri - vars: - tox_extra_args: test-s3:bionic-stein-s3 -- job: - name: test-s3-bionic-train-s3 - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: test-s3:bionic-train-s3 -- job: - name: test-s3-bionic-ussuri-s3 - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: test-s3:bionic-ussuri-s3 -- job: - name: test-s3-focal-ussuri-s3 - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: test-s3:focal-ussuri-s3 -- job: - name: test-s3-focal-victoria-s3 - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: test-s3:focal-victoria-s3 -- job: - name: test-s3-focal-wallaby-s3 - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: test-s3:focal-wallaby-s3 - job: name: test-s3-focal-xena-s3 parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena vars: tox_extra_args: test-s3:focal-xena-s3 - job: name: test-s3-focal-yoga-s3 parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-yoga vars: tox_extra_args: test-s3:focal-yoga-s3 -- job: - name: test-s3-hirsute-wallaby-s3 - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: test-s3:hirsute-wallaby-s3 - job: name: test-s3-impish-xena-s3 parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-xena vars: tox_extra_args: test-s3:impish-xena-s3 - job: name: test-s3-jammy-yoga-s3 parent: func-target - dependencies: *smoke-jobs + dependencies: + - focal-yoga vars: tox_extra_args: test-s3:jammy-yoga-s3 diff --git a/src/metadata.yaml b/src/metadata.yaml index 9a9be09..d2336d1 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -10,10 +10,7 @@ description: | tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish provides: metric-service: diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 5673a27..0000000 --- a/src/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,107 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '7' - - '8' - - '9' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '11' -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - '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' diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 8a7d935..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,107 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '7' - - '8' - - '9' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '11' -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - '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' diff --git a/src/tests/bundles/bionic-stein-s3.yaml b/src/tests/bundles/bionic-stein-s3.yaml deleted file mode 100644 index 47d9273..0000000 --- a/src/tests/bundles/bionic-stein-s3.yaml +++ /dev/null @@ -1,124 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '4' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '5' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '6' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '7' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '8' -relations: - - - keystone:shared-db - - percona-cluster:shared-db - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - percona-cluster:shared-db - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates - \ No newline at end of file diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index ece54c8..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,107 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '7' - - '8' - - '9' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '11' -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - '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' diff --git a/src/tests/bundles/bionic-train-s3.yaml b/src/tests/bundles/bionic-train-s3.yaml deleted file mode 100644 index 1b153a1..0000000 --- a/src/tests/bundles/bionic-train-s3.yaml +++ /dev/null @@ -1,123 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '4' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '5' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '6' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '7' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '8' -relations: - - - keystone:shared-db - - percona-cluster:shared-db - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - percona-cluster:shared-db - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index 4d9efec..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,107 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '7' - - '8' - - '9' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '11' -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - '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' diff --git a/src/tests/bundles/bionic-ussuri-s3.yaml b/src/tests/bundles/bionic-ussuri-s3.yaml deleted file mode 100644 index f250dd8..0000000 --- a/src/tests/bundles/bionic-ussuri-s3.yaml +++ /dev/null @@ -1,123 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '4' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '5' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '6' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '7' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '8' -relations: - - - keystone:shared-db - - percona-cluster:shared-db - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - percona-cluster:shared-db - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 0c2ae26..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,107 +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: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '7' - - '8' - - '9' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '10' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '11' -relations: - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - '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' diff --git a/src/tests/bundles/focal-ussuri-s3.yaml b/src/tests/bundles/focal-ussuri-s3.yaml deleted file mode 100644 index 9c2dd1d..0000000 --- a/src/tests/bundles/focal-ussuri-s3.yaml +++ /dev/null @@ -1,145 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series focal - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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: *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' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '6' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal yet - series: bionic - to: - - '10' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '7' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '8' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '9' -relations: - - - keystone:shared-db - - keystone-mysql-router:shared-db - - - keystone-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - gnocchi:shared-db - - gnocchi-mysql-router:shared-db - - - gnocchi-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 3f215bd..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,144 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &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': - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-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' - - 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' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '9' - - '10' - - '11' - - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal yet - series: bionic - to: - - '13' - -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' - - - - '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' diff --git a/src/tests/bundles/focal-victoria-s3.yaml b/src/tests/bundles/focal-victoria-s3.yaml deleted file mode 100644 index fa0c275..0000000 --- a/src/tests/bundles/focal-victoria-s3.yaml +++ /dev/null @@ -1,145 +0,0 @@ -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: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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: *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' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '6' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal yet - series: bionic - to: - - '10' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '7' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '8' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '9' -relations: - - - keystone:shared-db - - keystone-mysql-router:shared-db - - - keystone-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - gnocchi:shared-db - - gnocchi-mysql-router:shared-db - - - gnocchi-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 3e2b50e..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,144 +0,0 @@ -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': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-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' - - 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' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '9' - - '10' - - '11' - - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal yet - series: bionic - to: - - '13' - -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' - - - - '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' diff --git a/src/tests/bundles/focal-wallaby-s3.yaml b/src/tests/bundles/focal-wallaby-s3.yaml deleted file mode 100644 index b4866b5..0000000 --- a/src/tests/bundles/focal-wallaby-s3.yaml +++ /dev/null @@ -1,145 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &series focal - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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: *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' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '6' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal yet - series: bionic - to: - - '10' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '7' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '8' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '9' -relations: - - - keystone:shared-db - - keystone-mysql-router:shared-db - - - keystone-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - gnocchi:shared-db - - gnocchi-mysql-router:shared-db - - - gnocchi-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 6316962..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,144 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &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': - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-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' - - 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' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '9' - - '10' - - '11' - - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal yet - series: bionic - to: - - '13' - -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' - - - - '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' diff --git a/src/tests/bundles/focal-xena-s3.yaml b/src/tests/bundles/focal-xena-s3.yaml index 23a0c48..c466780 100644 --- a/src/tests/bundles/focal-xena-s3.yaml +++ b/src/tests/bundles/focal-xena-s3.yaml @@ -25,14 +25,17 @@ machines: applications: keystone-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 vault-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 @@ -40,27 +43,31 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge gnocchi: series: *series charm: ../../../gnocchi @@ -71,7 +78,7 @@ applications: to: - '6' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal yet series: bionic @@ -89,7 +96,7 @@ applications: to: - '7' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -98,12 +105,14 @@ applications: zone: 1 to: - '8' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 series: *series to: - '9' + channel: latest/edge relations: - - keystone:shared-db - keystone-mysql-router:shared-db diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 07d2c2d..e02f134 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -28,12 +28,14 @@ machines: applications: keystone-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 @@ -41,33 +43,37 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -77,9 +83,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -89,6 +96,7 @@ applications: - '9' - '10' - '11' + channel: latest/edge gnocchi: series: *series @@ -100,7 +108,7 @@ applications: - '12' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal yet series: bionic diff --git a/src/tests/bundles/focal-yoga-s3.yaml b/src/tests/bundles/focal-yoga-s3.yaml index e18d611..2176bef 100644 --- a/src/tests/bundles/focal-yoga-s3.yaml +++ b/src/tests/bundles/focal-yoga-s3.yaml @@ -25,14 +25,17 @@ machines: applications: keystone-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 vault-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 @@ -40,27 +43,31 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge gnocchi: series: *series charm: ../../../gnocchi @@ -71,7 +78,7 @@ applications: to: - '6' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal yet series: bionic @@ -89,7 +96,7 @@ applications: to: - '7' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -98,12 +105,14 @@ applications: zone: 1 to: - '8' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 series: *series to: - '9' + channel: latest/edge relations: - - keystone:shared-db - keystone-mysql-router:shared-db diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 046e323..dd918ee 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -28,12 +28,14 @@ machines: applications: keystone-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 @@ -41,33 +43,37 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -77,9 +83,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -89,6 +96,7 @@ applications: - '9' - '10' - '11' + channel: latest/edge gnocchi: series: *series @@ -100,7 +108,7 @@ applications: - '12' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal yet series: bionic diff --git a/src/tests/bundles/hirsute-wallaby-s3.yaml b/src/tests/bundles/hirsute-wallaby-s3.yaml deleted file mode 100644 index ecbcc0a..0000000 --- a/src/tests/bundles/hirsute-wallaby-s3.yaml +++ /dev/null @@ -1,145 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: {} - 9: {} - 10: - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - gnocchi-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: *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' - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - storage-backend: s3 - to: - - '6' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal/groovy yet - series: bionic - to: - - '10' - #swift-proxy is used to test gnocchi against an S3 storage backend - swift-proxy: - charm: swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '7' - swift-storage: - charm: cs:~openstack-charmers-next/swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: *openstack-origin - zone: 1 - to: - - '8' - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - series: *series - to: - - '9' -relations: - - - keystone:shared-db - - keystone-mysql-router:shared-db - - - keystone-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - gnocchi:shared-db - - gnocchi-mysql-router:shared-db - - - gnocchi-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - 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:coordinator-memcached - - memcached:cache - - - swift-proxy:identity-service - - keystone:identity-service - - - swift-storage:swift-storage - - swift-proxy:swift-storage - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - vault:certificates - - swift-proxy:certificates - - - vault:certificates - - gnocchi:certificates - - - vault:certificates - - ceilometer:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - rabbitmq-server:certificates diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 4774675..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,144 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &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': - series: bionic - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "6" -applications: - - keystone-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' - - 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' - - ceilometer: - charm: cs:~openstack-charmers-next/ceilometer - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - monitor-count: '3' - source: *openstack-origin - to: - - '9' - - '10' - - '11' - - gnocchi: - series: *series - charm: ../../../gnocchi - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '12' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding at bionic as memcached doesn't support focal/groovy yet - series: bionic - to: - - '13' - -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' - - - - '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' diff --git a/src/tests/bundles/impish-xena-s3.yaml b/src/tests/bundles/impish-xena-s3.yaml index d2dee7f..deb5901 100644 --- a/src/tests/bundles/impish-xena-s3.yaml +++ b/src/tests/bundles/impish-xena-s3.yaml @@ -25,14 +25,17 @@ machines: applications: keystone-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 vault-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 @@ -40,27 +43,31 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge gnocchi: series: *series charm: ../../../gnocchi @@ -71,7 +78,7 @@ applications: to: - '6' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal/groovy yet series: bionic @@ -89,7 +96,7 @@ applications: to: - '7' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -98,12 +105,14 @@ applications: zone: 1 to: - '8' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 series: *series to: - '9' + channel: latest/edge relations: - - keystone:shared-db - keystone-mysql-router:shared-db diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 2122101..19fd030 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -28,12 +28,14 @@ machines: applications: keystone-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 @@ -41,33 +43,37 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -77,9 +83,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -89,6 +96,7 @@ applications: - '9' - '10' - '11' + channel: latest/edge gnocchi: series: *series @@ -100,7 +108,7 @@ applications: - '12' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal/groovy yet series: bionic diff --git a/src/tests/bundles/jammy-yoga-s3.yaml b/src/tests/bundles/jammy-yoga-s3.yaml index 2475124..a45b9bb 100644 --- a/src/tests/bundles/jammy-yoga-s3.yaml +++ b/src/tests/bundles/jammy-yoga-s3.yaml @@ -25,14 +25,17 @@ machines: applications: keystone-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 vault-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 @@ -40,27 +43,31 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge gnocchi: series: *series charm: ../../../gnocchi @@ -71,7 +78,7 @@ applications: to: - '6' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal/groovy yet series: bionic @@ -89,7 +96,7 @@ applications: to: - '7' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: ch:swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -98,12 +105,14 @@ applications: zone: 1 to: - '8' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 series: *series to: - '9' + channel: latest/edge relations: - - keystone:shared-db - keystone-mysql-router:shared-db diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index b05d2ca..8f9e918 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -28,12 +28,14 @@ machines: applications: keystone-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 @@ -41,33 +43,37 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge ceilometer: - charm: cs:~openstack-charmers-next/ceilometer + charm: ch:ceilometer num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' @@ -77,9 +83,10 @@ applications: - '6' - '7' - '8' + channel: latest/edge ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -89,6 +96,7 @@ applications: - '9' - '10' - '11' + channel: latest/edge gnocchi: series: *series @@ -100,7 +108,7 @@ applications: - '12' memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding at bionic as memcached doesn't support focal/groovy yet series: bionic diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 82b623d..4779588 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,28 +1,23 @@ charm_name: gnocchi gate_bundles: - - bionic-queens - - test-s3: bionic-stein-s3 - - test-s3: bionic-ussuri-s3 - - test-s3: focal-ussuri-s3 - - test-s3: focal-victoria-s3 - - test-s3: focal-wallaby-s3 - test-s3: focal-xena-s3 - - test-s3: hirsute-wallaby-s3 - test-s3: impish-xena-s3 + smoke_bundles: - - focal-ussuri + - test-s3: focal-xena-s3 + dev_bundles: - - bionic-rocky - - test-s3: bionic-train-s3 - test-s3: focal-yoga-s3 - test-s3: jammy-yoga-s3 + configure: - zaza.openstack.charm_tests.ceilometer.setup.basic_setup - test-s3: - zaza.openstack.charm_tests.vault.setup.auto_initialize - zaza.openstack.charm_tests.gnocchi.setup.configure_s3_backend - zaza.openstack.charm_tests.ceilometer.setup.basic_setup + tests: - zaza.openstack.charm_tests.gnocchi.tests.GnocchiTest - zaza.openstack.charm_tests.gnocchi.tests.GnocchiExternalCATest @@ -31,6 +26,7 @@ tests: - zaza.openstack.charm_tests.gnocchi.tests.GnocchiS3Test - zaza.openstack.charm_tests.gnocchi.tests.GnocchiTest - zaza.openstack.charm_tests.gnocchi.tests.GnocchiExternalCATest + target_deploy_status: vault: workload-status: blocked @@ -44,8 +40,8 @@ target_deploy_status: gnocchi: workload-status: blocked workload-status-message: Mandatory S3 configuration parameters missing. + tests_options: force_deploy: - - hirsute-wallaby-s3 - impish-xena-s3 - jammy-yoga-s3