openstack/charm-openstack-dashboard
Code Issues Proposed changes

Add charmcraft 3 support

Browse Source 
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
- Add noble/oracular to charmhelpers
- Drop non-noble tests

Change-Id: I06c6c515ee190a63a8bb8be43dc9ffe2a1f92030
This commit is contained in:
Billy Olsen 2024-06-21 17:52:22 -07:00 committed by Billy Olsen
parent e84bd0f234
commit ede69911b6
No known key found for this signature in database
GPG Key ID: 6A8CA9BDB5995260
10 changed files with 24 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
charmcraft.yaml
View File

@ -4,30 +4,18 @@ parts:
charm:
plugin: dump
source: .
prime:
- actions/*
- charmhelpers/*
- files/*
- hooks/*
- lib/*
- templates/*
- actions.yaml
- config.yaml
- copyright
- hardening.yaml
- icon.svg
- LICENSE
- Makefile
- metadata.yaml
- README.md
bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures:
- amd64
run-on:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, 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
charmhelpers/core/host_factory/ubuntu.py
View File

@ -33,6 +33,8 @@ UBUNTU_RELEASES = (
'kinetic',
'lunar',
'mantic',
'noble',
'oracular',
)

2
config.yaml
View File

@ -10,7 +10,7 @@ options:
Setting this to True will allow supporting services to log to syslog.
openstack-origin:
type: string
default: bobcat
default: caracal
description: |
Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry,

8
osci.yaml
View File

@ -6,16 +6,16 @@
jobs:
# gr tests are disabled due to:
# https://bugs.launchpad.net/charm-openstack-dashboard/+bug/1951644
- jammy-antelope-gr:
- noble-caracal-gr:
voting: false
vars:
needs_charm_build: true
charm_build_name: openstack-dashboard
build_type: charmcraft
charmcraft_channel: 2.x/stable
charmcraft_channel: 3.x/beta
- job:
name: jammy-antelope-gr
name: noble-caracal-gr
parent: func-target
dependencies:
- osci-lint
@ -23,4 +23,4 @@
soft: true
- charm-build
vars:
tox_extra_args: '-- vault:jammy-vault dashboard:jammy-antelope-cmr-vault'
tox_extra_args: '-- vault:noble-vault dashboard:noble-caracal-cmr-vault'

73
tests/bundles/jammy-antelope.yaml
View File

@ -1,73 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-antelope
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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: 2024.1/edge
openstack-dashboard:
charm: ../../openstack-dashboard.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

73
tests/bundles/jammy-bobcat.yaml
View File

@ -1,73 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-bobcat
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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: 2024.1/edge
openstack-dashboard:
charm: ../../openstack-dashboard.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

73
tests/bundles/jammy-caracal.yaml
View File

@ -1,73 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:jammy-caracal
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
constraints: virt-type=kvm
'4':
constraints: virt-type=kvm mem=3072M
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
openstack-dashboard-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: 2024.1/edge
openstack-dashboard:
charm: ../../openstack-dashboard.charm
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '4'
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:shared-db'
- 'openstack-dashboard-mysql-router:shared-db'
- - 'openstack-dashboard-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'openstack-dashboard:identity-service'
- 'keystone:identity-service'

36
tests/bundles/jammy-vault.yaml
View File

@ -1,36 +0,0 @@
series: jammy
local_overlay_enabled: false
machines:
'0':
constraints: virt-type=kvm mem=3072M
'1':
constraints: virt-type=kvm mem=3072M
'2':
constraints: virt-type=kvm mem=3072M
'3':
services:
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
num_units: 3
options:
source: distro
to:
- '0'
- '1'
- '2'
channel: latest/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
vault:
num_units: 1
series: bionic
charm: ch:vault
to:
- '3'
channel: latest/edge
relations:
- - vault:shared-db
- vault-mysql-router:shared-db
- - vault-mysql-router:db-router
- mysql-innodb-cluster:db-router

2
tests/bundles/noble-caracal.yaml
View File

@ -46,7 +46,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: 2024.1/edge
channel: latest/edge
openstack-dashboard:
charm: ../../openstack-dashboard.charm

6
tests/tests.yaml
View File

@ -4,11 +4,9 @@ comment:
- ''
smoke_bundles:
- jammy-caracal
- noble-caracal
gate_bundles:
- jammy-antelope
- jammy-bobcat
- jammy-caracal
- noble-caracal
dev_bundles:
- noble-caracal
configure: