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 725735d..df245a1 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: designate diff --git a/src/metadata.yaml b/src/metadata.yaml index 7aa2899..4774336 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,10 +12,7 @@ tags: - openstack - dns series: -- bionic - focal -- groovy -- hirsute - impish subordinate: false provides: diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 7c1ef35..0000000 --- a/src/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,76 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - '4': - '5': - '6': - -applications: - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - to: - - '6' - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '2' - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - to: - - '3' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '4' - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - to: - - '5' - nrpe: - charm: cs:nrpe - -relations: -- - 'designate:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:amqp' - - 'rabbitmq-server:amqp' -- - 'designate:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:dns-backend' - - 'designate-bind:dns-backend' -- - 'designate:coordinator-memcached' - - 'memcached:cache' -- - 'designate:dnsaas' - - 'neutron-api:external-dns' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'designate: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 4dc7a81..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,81 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - '4': - '5': - '6': - -applications: - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - to: - - '6' - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '2' - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - to: - - '3' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '4' - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: cloud:bionic-rocky - to: - - '5' - nrpe: - charm: cs:nrpe - -relations: -- - 'designate:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:amqp' - - 'rabbitmq-server:amqp' -- - 'designate:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:dns-backend' - - 'designate-bind:dns-backend' -- - 'designate:coordinator-memcached' - - 'memcached:cache' -- - 'designate:dnsaas' - - 'neutron-api:external-dns' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'designate: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 aa47c96..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,81 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - '4': - '5': - '6': - -applications: - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - to: - - '6' - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '2' - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - to: - - '3' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '4' - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: cloud:bionic-stein - to: - - '5' - nrpe: - charm: cs:nrpe - -relations: -- - 'designate:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:amqp' - - 'rabbitmq-server:amqp' -- - 'designate:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:dns-backend' - - 'designate-bind:dns-backend' -- - 'designate:coordinator-memcached' - - 'memcached:cache' -- - 'designate:dnsaas' - - 'neutron-api:external-dns' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'designate: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 454d82d..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,81 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - '4': - '5': - '6': - -applications: - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-train - to: - - '6' - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '2' - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - to: - - '3' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '4' - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: cloud:bionic-train - to: - - '5' - nrpe: - charm: cs:nrpe - -relations: -- - 'designate:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:amqp' - - 'rabbitmq-server:amqp' -- - 'designate:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:dns-backend' - - 'designate-bind:dns-backend' -- - 'designate:coordinator-memcached' - - 'memcached:cache' -- - 'designate:dnsaas' - - 'neutron-api:external-dns' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'designate: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 4bf08e7..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,82 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - '4': - '5': - '6': - -applications: - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: cloud:bionic-ussuri - to: - - '6' - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - to: - - '1' - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '2' - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - to: - - '3' - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - to: - - '4' - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: cloud:bionic-ussuri - to: - - '5' - nrpe: - charm: cs:nrpe - -relations: -- - 'designate:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:amqp' - - 'rabbitmq-server:amqp' -- - 'designate:identity-service' - - 'keystone:identity-service' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' -- - 'designate:dns-backend' - - 'designate-bind:dns-backend' -- - 'designate:coordinator-memcached' - - 'memcached:cache' -- - 'designate:dnsaas' - - 'neutron-api:external-dns' -- - 'neutron-api:identity-service' - - 'keystone:identity-service' -- - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' -- - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' -- - 'designate: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 af64a0b..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,132 +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': - series: bionic - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding charm at bionic as it isn't available for focal+ yet - series: bionic - to: - - '7' - - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate: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 ad2eac2..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,132 +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': - series: bionic - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding charm at bionic as it isn't available for focal+ yet - series: bionic - to: - - '7' - - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate: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 4a3d95a..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,132 +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': - series: bionic - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding charm at bionic as it isn't available for focal+ yet - series: bionic - to: - - '7' - - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 8060df7..cda1f96 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -21,14 +21,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-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 @@ -36,43 +39,48 @@ 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 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true openstack-origin: *openstack-origin to: - '5' + channel: latest/edge designate-bind: - charm: cs:~openstack-charmers-next/designate-bind + charm: ch:designate-bind num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: #openstack-origin: *openstack-origin to: - '6' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding charm at bionic as it isn't available for focal+ yet series: bionic diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index e79c7b0..a507222 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -21,14 +21,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-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 @@ -36,43 +39,48 @@ 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 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true openstack-origin: *openstack-origin to: - '5' + channel: latest/edge designate-bind: - charm: cs:~openstack-charmers-next/designate-bind + charm: ch:designate-bind num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: #openstack-origin: *openstack-origin to: - '6' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding charm at bionic as it isn't available for 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 c51ccb1..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,132 +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': - series: bionic - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - - designate-bind: - charm: cs:~openstack-charmers-next/designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - - memcached: - charm: cs:~memcached-team/memcached - num_units: 1 - # holding charm at bionic as it isn't available for focal+ yet - series: bionic - to: - - '7' - - designate: - charm: ../../../designate - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index e72390a..6ec8854 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -21,14 +21,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-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 @@ -36,43 +39,48 @@ 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 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true openstack-origin: *openstack-origin to: - '5' + channel: latest/edge designate-bind: - charm: cs:~openstack-charmers-next/designate-bind + charm: ch:designate-bind num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: #openstack-origin: *openstack-origin to: - '6' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding charm at bionic as it isn't available for focal+ yet series: bionic diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index f0152d7..b330c00 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -21,14 +21,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge designate-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-api-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 @@ -36,43 +39,48 @@ 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 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true openstack-origin: *openstack-origin to: - '5' + channel: latest/edge designate-bind: - charm: cs:~openstack-charmers-next/designate-bind + charm: ch:designate-bind num_units: 1 # NOTE(ajkavanagh) apparently it has no openstack origin! #options: #openstack-origin: *openstack-origin to: - '6' + channel: latest/edge memcached: - charm: cs:~memcached-team/memcached + charm: ch:memcached num_units: 1 # holding charm at bionic as it isn't available for focal+ yet series: bionic diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index a839ffc..5bbad47 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,22 +1,13 @@ charm_name: designate smoke_bundles: - - bionic-train + - focal-xena gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: - - bionic-rocky - - bionic-train - focal-yoga - jammy-yoga @@ -32,6 +23,5 @@ tests_options: force_deploy: # NOTE(lourot): this is needed because the NRPE charm isn't available on # non-LTS Ubuntu series. See lp:1933643 - - hirsute-wallaby - impish-xena - jammy-yoga