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 fac02c0..c2ebf40 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,11 +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-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: magnum-dashboard diff --git a/src/metadata.yaml b/src/metadata.yaml index c048b32..329d3b9 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -6,10 +6,7 @@ description: | tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish subordinate: true requires: diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 6044eb5..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,83 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-ussuri - -series: bionic - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - '4': - -applications: - - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - - magnum: - charm: cs:~openstack-charmers-next/magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - cert-manager-type: x509keypair - to: - - '3' - - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - magnum-dashboard: - charm: ../../../magnum-dashboard - -relations: - - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:shared-db' - - 'percona-cluster:shared-db' - - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 0204d00..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,86 +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 - series: bionic - '1': - '2': - '3': - '4': - -applications: - - # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, - # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - series: bionic - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - - magnum: - charm: cs:~openstack-charmers-next/magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - cert-manager-type: x509keypair - to: - - '3' - - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - magnum-dashboard: - charm: ../../../magnum-dashboard - -relations: - - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:shared-db' - - 'percona-cluster:shared-db' - - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 6a8714f..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,86 +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 - series: bionic - '1': - '2': - '3': - '4': - -applications: - - # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, - # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - series: bionic - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - - magnum: - charm: cs:~openstack-charmers-next/magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - cert-manager-type: x509keypair - to: - - '3' - - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - magnum-dashboard: - charm: ../../../magnum-dashboard - -relations: - - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:shared-db' - - 'percona-cluster:shared-db' - - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 40c752d..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,86 +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 - series: bionic - '1': - '2': - '3': - '4': - -applications: - - # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, - # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - series: bionic - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - - magnum: - charm: cs:~openstack-charmers-next/magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - cert-manager-type: x509keypair - to: - - '3' - - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - magnum-dashboard: - charm: ../../../magnum-dashboard - -relations: - - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:shared-db' - - 'percona-cluster:shared-db' - - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 45397f1..05850a6 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -19,7 +19,7 @@ applications: # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: ch:percona-cluster num_units: 1 series: bionic options: @@ -27,37 +27,42 @@ applications: innodb-buffer-pool-size: 256M to: - '0' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '1' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '2' + channel: latest/edge magnum: - charm: cs:~openstack-charmers-next/magnum + charm: ch:magnum num_units: 1 options: openstack-origin: *openstack-origin cert-manager-type: x509keypair to: - '3' + channel: latest/edge openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard + charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge magnum-dashboard: charm: ../../../magnum-dashboard diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 3133173..12a88c7 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -19,7 +19,7 @@ applications: # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: ch:percona-cluster num_units: 1 series: bionic options: @@ -27,37 +27,42 @@ applications: innodb-buffer-pool-size: 256M to: - '0' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '1' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '2' + channel: latest/edge magnum: - charm: cs:~openstack-charmers-next/magnum + charm: ch:magnum num_units: 1 options: openstack-origin: *openstack-origin cert-manager-type: x509keypair to: - '3' + channel: latest/edge openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard + charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge magnum-dashboard: charm: ../../../magnum-dashboard diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 7730a23..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,86 +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 - series: bionic - '1': - '2': - '3': - '4': - -applications: - - # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, - # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - series: bionic - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - to: - - '0' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '1' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '2' - - magnum: - charm: cs:~openstack-charmers-next/magnum - num_units: 1 - options: - openstack-origin: *openstack-origin - cert-manager-type: x509keypair - to: - - '3' - - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - - magnum-dashboard: - charm: ../../../magnum-dashboard - -relations: - - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:shared-db' - - 'percona-cluster:shared-db' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:shared-db' - - 'percona-cluster:shared-db' - - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:dashboard-plugin' - - 'magnum-dashboard:dashboard' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 8a99adc..51d72da 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -19,7 +19,7 @@ applications: # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: ch:percona-cluster num_units: 1 series: bionic options: @@ -27,37 +27,42 @@ applications: innodb-buffer-pool-size: 256M to: - '0' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '1' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '2' + channel: latest/edge magnum: - charm: cs:~openstack-charmers-next/magnum + charm: ch:magnum num_units: 1 options: openstack-origin: *openstack-origin cert-manager-type: x509keypair to: - '3' + channel: latest/edge openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard + charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge magnum-dashboard: charm: ../../../magnum-dashboard diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 291e89c..9a1ab18 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -19,7 +19,7 @@ applications: # TODO: This needs to be replaced with mysql-innodb-cluster + db routers, # once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed. percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: ch:percona-cluster num_units: 1 series: bionic options: @@ -27,37 +27,42 @@ applications: innodb-buffer-pool-size: 256M to: - '0' + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '1' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '2' + channel: latest/edge magnum: - charm: cs:~openstack-charmers-next/magnum + charm: ch:magnum num_units: 1 options: openstack-origin: *openstack-origin cert-manager-type: x509keypair to: - '3' + channel: latest/edge openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard + charm: ch:openstack-dashboard num_units: 1 options: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge magnum-dashboard: charm: ../../../magnum-dashboard diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index c97ed04..d69ba91 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,14 +1,9 @@ charm_name: magnum-dashboard smoke_bundles: -- focal-victoria +- focal-xena gate_bundles: -- bionic-ussuri -- focal-ussuri -- focal-victoria -- focal-wallaby - focal-xena -- hirsute-wallaby - impish-xena dev_bundles: @@ -25,6 +20,5 @@ tests: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga