Add Antelope support

* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

Change-Id: I697ad8a7d5e6f653e0c6be1461059fb3a0572fed
This commit is contained in:
Corey Bryant 2023-02-14 21:26:01 +00:00
parent e52b6617f8
commit 104472d985
8 changed files with 121 additions and 8 deletions

View File

@ -1,4 +1,4 @@
- project:
templates:
- openstack-python3-charm-zed-jobs
- openstack-python3-charm-jobs
- openstack-cover-jobs

View File

@ -23,3 +23,6 @@ bases:
- name: ubuntu
channel: "22.10"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "23.04"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -1,7 +1,7 @@
- project:
templates:
- charm-unit-jobs-py310
- charm-zed-functional-jobs
- charm-functional-jobs
vars:
needs_charm_build: true
charm_build_name: manila-dashboard

View File

@ -9,6 +9,7 @@ tags:
series:
- jammy
- kinetic
- lunar
subordinate: true
requires:
dashboard:

View File

@ -0,0 +1,108 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-antelope
local_overlay_enabled: False
series: jammy
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'

View File

@ -3,7 +3,7 @@ variables:
local_overlay_enabled: False
series: jammy
series: lunar
comment:
- 'machines section to decide order of deployment. database sooner = faster'

View File

@ -1,15 +1,15 @@
charm_name: manila-dashboard
smoke_bundles:
- jammy-yoga
- jammy-zed
gate_bundles:
- jammy-yoga
- jammy-zed
dev_bundles:
- jammy-yoga
- jammy-zed
- jammy-antelope
- kinetic-zed
- lunar-antelope
target_deploy_status:
manila:
@ -25,3 +25,4 @@ tests:
tests_options:
force_deploy:
- kinetic-zed
- lunar-antelope

View File

@ -33,7 +33,7 @@ allowlist_externals =
charmcraft
bash
tox
rename.sh
{toxinidir}/rename.sh
deps =
-r{toxinidir}/requirements.txt