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: I8487abc15cf61abfa18d09aa73064e139fa92560
This commit is contained in:
Corey Bryant 2023-02-14 21:26:00 +00:00
parent 8ee74b472d
commit 03388e821f
8 changed files with 126 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: barbican-vault

View File

@ -7,6 +7,7 @@ tags:
series:
- jammy
- kinetic
- lunar
subordinate: true
provides:
secrets:

View File

@ -0,0 +1,112 @@
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':
'7':
'8':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
barbican-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
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: latest/edge
barbican:
charm: ch:barbican
num_units: 3
options:
openstack-origin: *openstack-origin
to:
- '4'
- '5'
- '6'
channel: latest/edge
barbican-vault:
charm: ../../../barbican-vault.charm
num_units: 0
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '7'
channel: latest/edge
vault:
charm: ch:vault
num_units: 1
to:
- '8'
channel: latest/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'vault:shared-db'
- 'vault-mysql-router:shared-db'
- - 'vault-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'barbican:shared-db'
- 'barbican-mysql-router:shared-db'
- - 'barbican-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'barbican:identity-service'
- - 'rabbitmq-server:amqp'
- 'barbican:amqp'
- - 'barbican-vault:secrets'
- 'barbican:secrets'
- - 'vault:secrets'
- 'barbican-vault:secrets-storage'

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,12 +1,12 @@
charm_name: barbican-vault
smoke_bundles:
- jammy-yoga
gate_bundles:
- jammy-yoga
dev_bundles:
- jammy-yoga
- jammy-zed
gate_bundles:
- jammy-zed
dev_bundles:
- jammy-antelope
- kinetic-zed
- lunar-antelope
target_deploy_status:
barbican-vault:
workload-status: waiting
@ -21,3 +21,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