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: I325ec88ff5033615fbf68334c08ef63e23bbe245
This commit is contained in:
Corey Bryant 2023-02-14 21:26:01 +00:00
parent b2703578ec
commit 30630eba2e
8 changed files with 111 additions and 9 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-generic

View File

@ -17,6 +17,7 @@ tags:
series:
- jammy
- kinetic
- lunar
subordinate: true
provides:
manila-plugin:

View File

@ -0,0 +1,97 @@
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':
services:
manila-mysql-router:
charm: ch:mysql-router
channel: latest/edge
keystone-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
manila:
charm: ch:manila
num_units: 1
options:
default-share-backend: generic
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
manila-generic:
charm: ../../../manila-generic.charm
options:
driver-handles-share-servers: False
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '4'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: latest/edge
nrpe:
charm: ch:nrpe
channel: latest/edge
relations:
- - 'manila:shared-db'
- 'manila-mysql-router:shared-db'
- - 'manila-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'manila:manila-plugin'
- 'manila-generic'
- - 'manila'
- 'rabbitmq-server'
- - 'manila'
- 'keystone'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'manila:nrpe-external-master'

View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: jammy
series: lunar
comment:
- 'machines section to decide order of deployment. database sooner = faster'

View File

@ -1,15 +1,15 @@
charm_name: manila-generic
gate_bundles:
- jammy-yoga
- jammy-zed
smoke_bundles:
- jammy-yoga
- jammy-zed
dev_bundles:
- jammy-yoga
- jammy-zed
- jammy-antelope
- kinetic-zed
- lunar-antelope
target_deploy_status: {}
@ -24,5 +24,6 @@ tests_options:
# nrpe charm doesn't support jammy+ and needs to be force installed
# https://bugs.launchpad.net/charm-nrpe/+bug/1968008
- jammy-zed
- jammy-yoga
- jammy-antelope
- 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