openstack
/
charm-hacluster
Code Issues Proposed changes

Updates for jammy enablement 

- charmcraft: build-on 20.04 -> run-on 20.04/22.04 [*archs]
- Refresh tox targets
- Drop impish bundles and OSCI testing
- Add jammy metadata

Change-Id: I518bc0212fadd3dc78b8bb21d229ee00e6b9a375
This commit is contained in:
James Page 2022-04-05 15:32:27 +01:00
parent d1191dbcab
commit bbe25222e0
8 changed files with 22 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

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

16
charmcraft.yaml
View File

@ -21,7 +21,15 @@ parts:
- README.md
bases:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
- build-on:
- name: ubuntu
channel: "20.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "20.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]

2
metadata.yaml
View File

@ -8,7 +8,7 @@ tags:
- misc
series:
- focal
- impish
- jammy
requires:
juju-info:
interface: juju-info

3
osci.yaml
View File

@ -1,8 +1,7 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-xena-functional-jobs
- charm-unit-jobs-py310
- charm-yoga-functional-jobs
vars:
needs_charm_build: true

57
tests/bundles/focal-xena.yaml
View File

@ -1,57 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
series: focal
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
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
keystone:
charm: ch:keystone
num_units: 3
options:
token-expiration: 60
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
channel: latest/edge
hacluster:
charm: ../../hacluster.charm
subordinate-to:
- keystone
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'hacluster:ha'
- 'keystone:ha'
- - "keystone-mysql-router:db-router"
- "mysql-innodb-cluster:db-router"

57
tests/bundles/impish-xena.yaml
View File

@ -1,57 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: impish
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
applications:
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
keystone:
charm: ch:keystone
num_units: 3
options:
token-expiration: 60
openstack-origin: *openstack-origin
to:
- '3'
- '4'
- '5'
channel: latest/edge
hacluster:
charm: ../../hacluster.charm
subordinate-to:
- keystone
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'hacluster:ha'
- 'keystone:ha'
- - "keystone-mysql-router:db-router"
- "mysql-innodb-cluster:db-router"

7
tests/tests.yaml
View File

@ -1,14 +1,12 @@
charm_name: hacluster
smoke_bundles:
- focal-xena
- focal-yoga
gate_bundles:
- focal-xena
- impish-xena
- focal-yoga
dev_bundles:
- focal-yoga
- jammy-yoga
configure:
@ -23,5 +21,4 @@ tests_options:
principle-app-name: keystone
hacluster-charm-name: hacluster
force_deploy:
- impish-xena
- jammy-yoga

5
tox.ini
View File

@ -76,6 +76,11 @@ basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt