diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 00000000..ba84f314 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,27 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - files/* + - hooks/* + - lib/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml index 139cbae1..8f9e340b 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -10,10 +10,7 @@ tags: - amqp - misc series: -- bionic - focal -- groovy -- hirsute - impish provides: amqp: diff --git a/osci.yaml b/osci.yaml index ea6496c9..08289d66 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,50 +1,7 @@ - project: templates: - - charm-yoga-unit-jobs - check: - jobs: - - rabbit-bionic - - rabbit-focal - - rabbit-hirsute - - rabbit-impish: - voting: false - - rabbit-jammy: - voting: false - vars: - needs_charm_build: false + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 + - charm-xena-functional-jobs + - charm-yoga-functional-jobs -- job: - name: rabbit-bionic - parent: func-target - dependencies: &smoke-jobs - - rabbit-focal - vars: - tox_extra_args: bionic-queens -- job: - name: rabbit-focal - parent: func-target - dependencies: &lint-jobs - - osci-lint - - tox-py36 - - tox-py38 - - tox-py39 - vars: - tox_extra_args: focal-ussuri -- job: - name: rabbit-hirsute - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: hirsute-wallaby -- job: - name: rabbit-impish - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: impish-xena -- job: - name: rabbit-jammy - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: jammy-yoga diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index f986ae76..00000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,46 +0,0 @@ -series: bionic - -relations: - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:shared-db - - percona-cluster:shared-db - - - cinder:identity-service - - keystone:identity-service - - - keystone:shared-db - - percona-cluster:shared-db - - - nrpe:nrpe-external-master - - rabbitmq-server:nrpe-external-master - - - nrpe:monitors - - nagios:monitors - -applications: - rabbitmq-server: - charm: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - admin-password: openstack - nagios: - charm: cs:nagios - num_units: 1 - nrpe: - charm: cs:nrpe diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 1f159b60..00000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,53 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-rocky - -series: bionic - -relations: - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:shared-db - - percona-cluster:shared-db - - - cinder:identity-service - - keystone:identity-service - - - keystone:shared-db - - percona-cluster:shared-db - - - nrpe:nrpe-external-master - - rabbitmq-server:nrpe-external-master - - - nrpe:monitors - - nagios:monitors - -applications: - rabbitmq-server: - charm: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - nagios: - charm: cs:nagios - num_units: 1 - nrpe: - charm: cs:nrpe diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 24805a24..00000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,53 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-stein - -series: bionic - -relations: - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:shared-db - - percona-cluster:shared-db - - - cinder:identity-service - - keystone:identity-service - - - keystone:shared-db - - percona-cluster:shared-db - - - nrpe:nrpe-external-master - - rabbitmq-server:nrpe-external-master - - - nrpe:monitors - - nagios:monitors - -applications: - rabbitmq-server: - charm: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - nagios: - charm: cs:nagios - num_units: 1 - nrpe: - charm: cs:nrpe diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index f5670166..00000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,53 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-train - -series: bionic - -relations: - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:shared-db - - percona-cluster:shared-db - - - cinder:identity-service - - keystone:identity-service - - - keystone:shared-db - - percona-cluster:shared-db - - - nrpe:nrpe-external-master - - rabbitmq-server:nrpe-external-master - - - nrpe:monitors - - nagios:monitors - -applications: - rabbitmq-server: - charm: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - nagios: - charm: cs:nagios - num_units: 1 - nrpe: - charm: cs:nrpe diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index a7cb8aa5..00000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,53 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-ussuri - -series: bionic - -relations: - - - cinder:amqp - - rabbitmq-server:amqp - - - cinder:shared-db - - percona-cluster:shared-db - - - cinder:identity-service - - keystone:identity-service - - - keystone:shared-db - - percona-cluster:shared-db - - - nrpe:nrpe-external-master - - rabbitmq-server:nrpe-external-master - - - nrpe:monitors - - nagios:monitors - -applications: - rabbitmq-server: - charm: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - max-connections: 1000 - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - nagios: - charm: cs:nagios - num_units: 1 - nrpe: - charm: cs:nrpe diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 517bc842..00000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,102 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - series: bionic # nagios not supported on focal yet - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - to: - - '7' - - nagios: - charm: cs:nagios - series: bionic # not supported on focal yet - num_units: 1 - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'nrpe:nrpe-external-master' - - 'rabbitmq-server:nrpe-external-master' - - - 'nrpe:monitors' - - 'nagios:monitors' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 620fc3ac..00000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,102 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - series: bionic # nagios not supported on focal yet - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - to: - - '7' - - nagios: - charm: cs:nagios - series: bionic # not supported on focal yet - num_units: 1 - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'nrpe:nrpe-external-master' - - 'rabbitmq-server:nrpe-external-master' - - - 'nrpe:monitors' - - 'nagios:monitors' diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 4e8c909d..00000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,102 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - series: bionic # nagios not supported on focal yet - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - to: - - '7' - - nagios: - charm: cs:nagios - series: bionic # not supported on focal yet - num_units: 1 - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'nrpe:nrpe-external-master' - - 'rabbitmq-server:nrpe-external-master' - - - 'nrpe:monitors' - - 'nagios:monitors' diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 32582915..5b3f7757 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -24,12 +24,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-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 @@ -37,6 +39,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: charm: "../../../rabbitmq-server" @@ -56,21 +59,23 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin admin-password: openstack to: - '7' + channel: latest/edge nagios: charm: cs:nagios diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index fbd82f99..1abac229 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -24,12 +24,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-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 @@ -37,6 +39,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: charm: "../../../rabbitmq-server" @@ -56,21 +59,23 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin admin-password: openstack to: - '7' + channel: latest/edge nagios: charm: cs:nagios diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index 324802fa..00000000 --- a/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,102 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: groovy - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - series: bionic # nagios not supported on focal+ yet - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - to: - - '7' - - nagios: - charm: cs:nagios - series: bionic # not supported on focal+ yet - num_units: 1 - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'nrpe:nrpe-external-master' - - 'rabbitmq-server:nrpe-external-master' - - - 'nrpe:monitors' - - 'nagios:monitors' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 82bfb867..00000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,102 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - series: bionic # nagios not supported on focal+ yet - - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - cinder-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: "../../../rabbitmq-server" - num_units: 3 - constraints: - cpu-cores=2 - options: - min-cluster-size: 3 - max-cluster-tries: 6 - ssl: "off" - management_plugin: "False" - stats_cron_schedule: "*/1 * * * *" - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - cinder: - charm: cs:~openstack-charmers-next/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - to: - - '7' - - nagios: - charm: cs:nagios - series: bionic # not supported on focal+ yet - num_units: 1 - to: - - '8' - - nrpe: - charm: cs:nrpe - -relations: - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'nrpe:nrpe-external-master' - - 'rabbitmq-server:nrpe-external-master' - - - 'nrpe:monitors' - - 'nagios:monitors' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index dd6e586e..d67c783d 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -24,12 +24,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-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 @@ -37,6 +39,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: charm: "../../../rabbitmq-server" @@ -56,21 +59,23 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin admin-password: openstack to: - '7' + channel: latest/edge nagios: charm: cs:nagios diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index eb4c3248..a2ef8975 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -24,12 +24,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge cinder-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 @@ -37,6 +39,7 @@ applications: - '0' - '1' - '2' + channel: latest/edge rabbitmq-server: charm: "../../../rabbitmq-server" @@ -56,21 +59,23 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin admin-password: openstack to: - '7' + channel: latest/edge nagios: charm: cs:nagios diff --git a/tests/tests.yaml b/tests/tests.yaml index 3fd2d8d4..204aafc0 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,22 +1,14 @@ charm_name: rabbitmq-server smoke_bundles: - - focal-ussuri + - 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 @@ -27,6 +19,5 @@ tests: tests_options: force_deploy: # nrpe charm doesn't support hirsute->jammy and needs to be force installed - - hirsute-wallaby - impish-xena - jammy-yoga