openstack
/
charm-watcher-dashboard
Code Issues Proposed changes

Updates for caracal testing support 

These updates, on the master branch, are to support testing the caracal
packages and support of the charms for caracal.  They do NOT lock the charms
down, and don't change the testing branches to stable branches.

Change-Id: Ib2455436c42a806ac0549a0097a7c8139d7488fe
This commit is contained in:
Alex Kavanagh 2024-02-09 18:15:48 +00:00
parent e99c14bf10
commit d2d7f8ff90
9 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
*__pycache__*
*.pyc
build
*.charm

6
charmcraft.yaml
View File

@ -6,9 +6,8 @@ parts:
build-packages:
- tox
- git
source: src/
build-packages:
- python3-dev
source: src/
build-snaps:
- charm
build-environment:
@ -23,6 +22,3 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, arm64, ppc64el, s390x]
- name: ubuntu
channel: "23.04"
architectures: [amd64, arm64, ppc64el, s390x]

2
osci.yaml
View File

@ -1,6 +1,6 @@
- project:
templates:
- charm-unit-jobs
- charm-unit-jobs-py310
- charm-functional-jobs
vars:
needs_charm_build: true

2
src/metadata.yaml
View File

@ -9,8 +9,6 @@ tags:
- openstack
series:
- jammy
- lunar
- mantic
subordinate: true
requires:
dashboard:

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

@ -42,7 +42,7 @@ applications:
keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -51,7 +51,7 @@ applications:
openstack-dashboard:
charm: ch:openstack-dashboard
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,7 +69,7 @@ applications:
watcher:
charm: ch:watcher
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin

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

@ -42,7 +42,7 @@ applications:
keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -51,7 +51,7 @@ applications:
openstack-dashboard:
charm: ch:openstack-dashboard
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,7 +69,7 @@ applications:
watcher:
charm: ch:watcher
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin

10
src/tests/bundles/mantic-bobcat.yaml → src/tests/bundles/jammy-caracal.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
openstack-origin: &openstack-origin cloud:jammy-caracal
series: mantic
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -42,7 +42,7 @@ applications:
keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -51,7 +51,7 @@ applications:
openstack-dashboard:
charm: ch:openstack-dashboard
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,7 +69,7 @@ applications:
watcher:
charm: ch:watcher
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin

8
src/tests/bundles/lunar-antelope.yaml → src/tests/bundles/noble-caracal.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: lunar
series: noble
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -42,7 +42,7 @@ applications:
keystone:
charm: ch:keystone
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -51,7 +51,7 @@ applications:
openstack-dashboard:
charm: ch:openstack-dashboard
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin
@ -69,7 +69,7 @@ applications:
watcher:
charm: ch:watcher
channel: latest/edge
channel: 2024.1/edge
num_units: 1
options:
openstack-origin: *openstack-origin

21
src/tests/tests.yaml
View File

@ -1,19 +1,18 @@
charm_name: watcher-dashboard
gate_bundles:
- jammy-antelope
- jammy-bobcat
- lunar-antelope
- mantic-bobcat
- jammy-antelope
- jammy-bobcat
- jammy-caracal
smoke_bundles:
- jammy-antelope
- jammy-bobcat
- jammy-caracal
configure:
- zaza.charm_tests.noop.setup.basic_setup
- zaza.charm_tests.noop.setup.basic_setup
tests:
- zaza.charm_tests.noop.tests.NoopTest
- zaza.charm_tests.noop.tests.NoopTest
tests_options:
force_deploy: []
force_deploy:
- noble-caracal
dev_bundles:
- noble-caracal