openstack/charm-magnum-dashboard
Code Issues Proposed changes

Add charmcraft 3 support

Browse Source 
Summary of changes:
- Update the charmcraft.yaml file to use base and platforms, only
  allowing noble support.
- Update config to default to caracal.
- Update osci.yaml to use the charmcraft 3.x/beta
- Drop non-noble tests
- Update constraints file from -2024.1.txt to -noble.txt
- Add charmbuild to .zuul.yaml

Change-Id: I64e07661b2a505e3315e96b92c16fa070140d85f
This commit is contained in:
Myles Penner 2024-09-04 18:37:44 +00:00
parent 853a09b9c6
commit 481137902e
10 changed files with 30 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.zuul.yaml
View File

@ -2,3 +2,8 @@
templates:
- openstack-python3-charm-jobs
- openstack-cover-jobs
check:
jobs:
- charmbuild
vars:
charm_build_name: magnum-dashboard

49
charmcraft.yaml
View File

@ -15,40 +15,21 @@ parts:
- rustc
- cargo
build-snaps:
- charm/latest/stable
- charm/latest/edge
build-environment:
- CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
- CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [s390x]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [ppc64el]
- build-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
run-on:
- name: ubuntu
channel: "22.04"
architectures: [arm64]
base: ubuntu@24.04
platforms:
amd64:
build-on: amd64
build-for: amd64
arm64:
build-on: arm64
build-for: arm64
ppc64el:
build-on: ppc64el
build-for: ppc64el
s390x:
build-on: s390x
build-for: s390x

2
osci.yaml
View File

@ -6,4 +6,4 @@
needs_charm_build: true
charm_build_name: magnum-dashboard
build_type: charmcraft
charmcraft_channel: 2.x/stable
charmcraft_channel: 3.x/stable

93
src/tests/bundles/jammy-antelope.yaml
View File

@ -1,93 +0,0 @@
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
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: ch:percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '1'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
channel: 2024.1/edge
magnum:
charm: ch:magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
channel: 2024.1/edge
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: 2024.1/edge
magnum-dashboard:
charm: ../../../magnum-dashboard.charm
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

93
src/tests/bundles/jammy-bobcat.yaml
View File

@ -1,93 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-bobcat
local_overlay_enabled: False
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: ch:percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '1'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
channel: 2024.1/edge
magnum:
charm: ch:magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
channel: 2024.1/edge
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: 2024.1/edge
magnum-dashboard:
charm: ../../../magnum-dashboard.charm
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

93
src/tests/bundles/jammy-caracal.yaml
View File

@ -1,93 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-caracal
local_overlay_enabled: False
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
series: bionic
'1':
'2':
'3':
'4':
applications:
# TODO: This needs to be replaced with mysql-innodb-cluster + db routers,
# once https://bugs.launchpad.net/ubuntu/+source/magnum/+bug/1915734 is fixed.
percona-cluster:
charm: ch:percona-cluster
num_units: 1
series: bionic
options:
max-connections: 1000
innodb-buffer-pool-size: 256M
to:
- '0'
channel: latest/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '1'
channel: latest/edge
keystone:
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '2'
channel: 2024.1/edge
magnum:
charm: ch:magnum
num_units: 1
options:
openstack-origin: *openstack-origin
cert-manager-type: x509keypair
to:
- '3'
channel: 2024.1/edge
openstack-dashboard:
charm: ch:openstack-dashboard
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
channel: 2024.1/edge
magnum-dashboard:
charm: ../../../magnum-dashboard.charm
relations:
- - 'keystone:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:shared-db'
- 'percona-cluster:shared-db'
- - 'magnum:amqp'
- 'rabbitmq-server:amqp'
- - 'magnum:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:shared-db'
- 'percona-cluster:shared-db'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'
- - 'openstack-dashboard:dashboard-plugin'
- 'magnum-dashboard:dashboard'

4
src/tests/bundles/noble-caracal.yaml
View File

@ -55,7 +55,7 @@ applications:
cert-manager-type: x509keypair
to:
- '3'
channel: 2024.1/edge
channel: latest/edge
openstack-dashboard:
charm: ch:openstack-dashboard
@ -64,7 +64,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '4'
channel: 2024.1/edge
channel: latest/edge
magnum-dashboard:
charm: ../../../magnum-dashboard.charm

6
src/tests/tests.yaml
View File

@ -1,10 +1,8 @@
charm_name: magnum-dashboard
smoke_bundles:
- jammy-caracal
- noble-caracal
gate_bundles:
- jammy-antelope
- jammy-bobcat
- jammy-caracal
- noble-caracal
dev_bundles:
- noble-caracal
target_deploy_status: {}

2
src/tox.ini
View File

@ -26,7 +26,7 @@ passenv =
OS_*
TEST_*
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/test-requirements.txt
[testenv:pep8]

8
tox.ini
View File

@ -62,21 +62,21 @@ commands =
[testenv:py3]
basepython = python3
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py312]
basepython = python3.12
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
@ -91,7 +91,7 @@ commands = flake8 {posargs} src unit_tests
# https://github.com/openstack/nova/blob/master/tox.ini
basepython = python3
deps =
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt}
-c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv =