diff --git a/charmcraft.yaml b/charmcraft.yaml index 00d4019..2df13f1 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -22,9 +22,9 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "22.10" - architectures: [amd64, s390x, ppc64el, arm64] - name: ubuntu channel: "23.04" architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "23.10" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/osci.yaml b/osci.yaml index ac9d992..4dc3a20 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: manila-dashboard build_type: charmcraft - charmcraft_channel: 2.1/stable + charmcraft_channel: 2.x/stable diff --git a/src/metadata.yaml b/src/metadata.yaml index f21ffa3..9c1744b 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,8 +8,8 @@ tags: - openstack series: - jammy -- kinetic - lunar +- mantic subordinate: true requires: dashboard: diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml similarity index 97% rename from src/tests/bundles/jammy-zed.yaml rename to src/tests/bundles/jammy-bobcat.yaml index 8d53db8..8eb263a 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -1,5 +1,5 @@ variables: - openstack-origin: &openstack-origin cloud:jammy-zed + openstack-origin: &openstack-origin cloud:jammy-bobcat local_overlay_enabled: False diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml new file mode 100644 index 0000000..5009452 --- /dev/null +++ b/src/tests/bundles/mantic-bobcat.yaml @@ -0,0 +1,108 @@ +variables: + openstack-origin: &openstack-origin distro + +local_overlay_enabled: False + +series: mantic + +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': + +applications: + keystone-mysql-router: + charm: ch:mysql-router + channel: latest/edge + manila-mysql-router: + charm: ch:mysql-router + channel: latest/edge + openstack-dashboard-mysql-router: + charm: ch:mysql-router + channel: latest/edge + + mysql-innodb-cluster: + charm: ch:mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + channel: latest/edge + + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + to: + - '3' + channel: latest/edge + + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + channel: latest/edge + + manila: + charm: ch:manila + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '5' + channel: latest/edge + + openstack-dashboard: + charm: ch:openstack-dashboard + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '6' + channel: latest/edge + + manila-dashboard: + charm: ../../../manila-dashboard.charm + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'manila:shared-db' + - 'manila-mysql-router:shared-db' + - - 'manila-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'manila:amqp' + - 'rabbitmq-server:amqp' + + - - 'manila:identity-service' + - 'keystone:identity-service' + + - - 'openstack-dashboard:shared-db' + - 'openstack-dashboard-mysql-router:shared-db' + - - 'openstack-dashboard-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'openstack-dashboard:identity-service' + - 'keystone:identity-service' + + - - 'openstack-dashboard:dashboard-plugin' + - 'manila-dashboard:dashboard' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index a7a48a6..d9f255e 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,14 +1,15 @@ charm_name: manila-dashboard smoke_bundles: -- jammy-zed +- jammy-antelope gate_bundles: -- jammy-zed +- jammy-antelope dev_bundles: -- jammy-antelope +- jammy-bobcat - lunar-antelope +- mantic-bobcat target_deploy_status: manila: @@ -24,3 +25,4 @@ tests: tests_options: force_deploy: - lunar-antelope + - mantic-bobcat