openstack
/
charm-rabbitmq-server
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: Ib9e5c7718ffaf28070fd9439f46453d7cf2333b5
This commit is contained in:
James Page 2022-04-05 11:53:36 +01:00
parent 12de0d964c
commit b2136a150e
8 changed files with 22 additions and 233 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

@ -22,7 +22,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

@ -11,7 +11,7 @@ tags:
- misc
series:
- focal
- impish
- jammy
provides:
amqp:
interface: rabbitmq

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

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

@ -1,107 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
series: focal
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':
series: bionic # nagios not supported on focal yet
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
cinder-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: ../../rabbitmq-server.charm
num_units: 3
constraints:
cpu-cores=2
options:
min-cluster-size: 3
max-cluster-tries: 6
ssl: "off"
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
source: *openstack-origin
to:
- '3'
- '4'
- '5'
cinder:
charm: ch:cinder
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '7'
channel: latest/edge
nagios:
charm: cs:nagios
series: bionic # not supported on focal yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
relations:
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

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

@ -1,107 +0,0 @@
variables:
openstack-origin: &openstack-origin distro
series: impish
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':
series: bionic # nagios not supported on focal+ yet
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
cinder-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: ../../rabbitmq-server.charm
num_units: 3
constraints:
cpu-cores=2
options:
min-cluster-size: 3
max-cluster-tries: 6
ssl: "off"
management_plugin: "False"
stats_cron_schedule: "*/1 * * * *"
source: *openstack-origin
to:
- '3'
- '4'
- '5'
cinder:
charm: ch:cinder
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
admin-password: openstack
to:
- '7'
channel: latest/edge
nagios:
charm: cs:nagios
series: bionic # not supported on focal+ yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
relations:
- - 'cinder:amqp'
- 'rabbitmq-server:amqp'
- - 'cinder:shared-db'
- 'cinder-mysql-router:shared-db'
- - 'cinder-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'cinder:identity-service'
- 'keystone:identity-service'
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

8
tests/tests.yaml
View File

@ -1,15 +1,12 @@
charm_name: rabbitmq-server
smoke_bundles:
- focal-xena
- focal-yoga
gate_bundles:
- focal-wallaby
- focal-xena
- impish-xena
- focal-yoga
dev_bundles:
- focal-yoga
- jammy-yoga
tests:
@ -19,5 +16,4 @@ tests:
tests_options:
force_deploy:
# nrpe charm doesn't support hirsute->jammy and needs to be force installed
- impish-xena
- jammy-yoga

10
tox.ini
View File

@ -51,11 +51,6 @@ commands =
charmcraft -v build
{toxinidir}/rename.sh
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/requirements.txt
@ -81,6 +76,11 @@ basepython = python3
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:pep8]
basepython = python3
deps = flake8==3.9.2