openstack/sunbeam-charms
Code Issues Proposed changes

[*-k8s] Migrate charm base to ubuntu@24.04

Browse Source 
Update charm base to ubuntu@24.04 for all k8s based charms. Deploying
k8s charm is abstracted from the underlying host base, therefore we can
already deploy next generation based charms.

Change-Id: If8e8960a58a39f9978aaeec26ed4df4a2b690396
Signed-off-by: Guillaume Boutry <guillaume.boutry@canonical.com>
This commit is contained in:
Guillaume Boutry 2024-10-08 13:59:45 +02:00
parent bd137e4c39
commit 4931ad53b9
No known key found for this signature in database
GPG Key ID: E95E3326872E55DE
33 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charms/aodh-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-aodh-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/barbican-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-barbican-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/ceilometer-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-ceilometer-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/cinder-ceph-k8s/charmcraft.yaml
View File

@ -14,7 +14,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-cinder-ceph-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/cinder-k8s/charmcraft.yaml
View File

@ -13,7 +13,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-cinder-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/designate-bind-k8s/charmcraft.yaml
View File

@ -16,7 +16,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-designate-bind-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/designate-k8s/charmcraft.yaml
View File

@ -14,7 +14,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-designate-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/glance-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-glance-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/gnocchi-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-gnocchi-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/heat-k8s/charmcraft.yaml
View File

@ -14,7 +14,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-heat-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/horizon-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-horizon-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/keystone-k8s/charmcraft.yaml
View File

@ -14,7 +14,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-keystone-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/keystone-ldap-k8s/charmcraft.yaml
View File

@ -8,7 +8,7 @@ description: |
deployment. This charm supports use of LDAP or Active Directory domain backends,
with configuration details provided by charm configuration options.
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/magnum-k8s/charmcraft.yaml
View File

@ -8,7 +8,7 @@ assumes:
- k8s-api
- juju >= 3.1
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/masakari-k8s/charmcraft.yaml
View File

@ -15,7 +15,7 @@ links:
source: https://opendev.org/openstack/sunbeam-charms
issues: https://bugs.launchpad.net/sunbeam-charms
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/neutron-k8s/charmcraft.yaml
View File

@ -21,7 +21,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-neutron-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/nova-k8s/charmcraft.yaml
View File

@ -22,7 +22,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-nova-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/octavia-k8s/charmcraft.yaml
View File

@ -13,7 +13,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-octavia-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/openstack-exporter-k8s/charmcraft.yaml
View File

@ -12,7 +12,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-openstack-exporter-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/openstack-images-sync-k8s/charmcraft.yaml
View File

@ -5,7 +5,7 @@ summary: Keep OpenStack images in sync with the latest versions
description: |
Openstack Images Sync operator allows synchronization from a SimpleStreams source to an OpenStack cloud.
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/ovn-central-k8s/charmcraft.yaml
View File

@ -30,7 +30,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-ovn-central-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/ovn-relay-k8s/charmcraft.yaml
View File

@ -16,7 +16,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-ovn-relay-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/placement-k8s/charmcraft.yaml
View File

@ -14,7 +14,7 @@ links:
issues:
- https://bugs.launchpad.net/charm-placement-k8s
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/tempest-k8s/charmcraft.yaml
View File

@ -14,7 +14,7 @@ links:
issues: https://bugs.launchpad.net/sunbeam-charms
documentation: https://discourse.charmhub.io/t/tempest-k8s-docs-index/13258
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

2
charms/watcher-k8s/charmcraft.yaml
View File

@ -16,7 +16,7 @@ links:
source: https://opendev.org/openstack/sunbeam-charms
issues: https://bugs.launchpad.net/sunbeam-charms
base: ubuntu@22.04
base: ubuntu@24.04
platforms:
amd64:

4
run_tox.sh
View File

@ -67,7 +67,7 @@ then
ops_sunbeam_src_path="ops-sunbeam/ops_sunbeam"
PYTHONPATH=$(python3 ./repository.py pythonpath) mypy ${ops_sunbeam_src_path}
elif [[ $1 =~ ^(py3|py310|py311)$ ]];
elif [[ $1 =~ ^(py3|py310|py312)$ ]];
then
# Run py3 on ops-sunbeam
@ -159,6 +159,6 @@ then
cp charms/$charm/${charm}.charm . || exit 1
python3 repository.py -v clean $charm || exit 1
else
echo "tox argument should be one of pep8, py3, py310, py311, cover";
echo "tox argument should be one of pep8, py3, py310, py312, cover";
exit 1
fi

14
tests/caas/smoke.yaml.j2
View File

@ -47,7 +47,7 @@ applications:
charm: ch:ovn-central-k8s
channel: 24.03/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -61,7 +61,7 @@ applications:
charm: ch:keystone-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -76,7 +76,7 @@ applications:
charm: ch:glance-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -90,7 +90,7 @@ applications:
charm: ch:heat-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -103,7 +103,7 @@ applications:
charm: ch:octavia-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -117,7 +117,7 @@ applications:
charm: ch:barbican-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: false
resources:
@ -130,7 +130,7 @@ applications:
charm: ch:magnum-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: false
resources:

14
tests/ceph/smoke.yaml.j2
View File

@ -33,7 +33,7 @@ applications:
charm: ch:keystone-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -48,7 +48,7 @@ applications:
charm: ch:cinder-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -61,7 +61,7 @@ applications:
charm: ch:cinder-ceph-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -73,7 +73,7 @@ applications:
charm: ch:gnocchi-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -86,7 +86,7 @@ applications:
charm: ch:ceilometer-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -99,7 +99,7 @@ applications:
charm: ch:aodh-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -115,7 +115,7 @@ applications:
charm: ch:watcher-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:

16
tests/core/smoke.yaml.j2
View File

@ -40,7 +40,7 @@ applications:
charm: ch:ovn-central-k8s
channel: 24.03/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -54,7 +54,7 @@ applications:
charm: ch:ovn-relay-k8s
channel: 24.03/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -66,7 +66,7 @@ applications:
charm: ch:keystone-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -81,7 +81,7 @@ applications:
charm: ch:glance-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -95,7 +95,7 @@ applications:
charm: ch:nova-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -110,7 +110,7 @@ applications:
charm: ch:placement-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -122,7 +122,7 @@ applications:
charm: ch:neutron-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
options:
@ -136,7 +136,7 @@ applications:
charm: ch:openstack-images-sync-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
options:

16
tests/misc/smoke.yaml.j2
View File

@ -38,7 +38,7 @@ applications:
charm: ch:keystone-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -53,7 +53,7 @@ applications:
charm: ch:designate-bind-k8s
channel: 9/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: false
resources:
@ -65,7 +65,7 @@ applications:
charm: ch:designate-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: false
resources:
@ -77,7 +77,7 @@ applications:
charm: ch:keystone-ldap-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
openstack-exporter:
{% if openstack_exporter_k8s is defined and openstack_exporter_k8s is sameas true -%}
@ -86,7 +86,7 @@ applications:
charm: ch:openstack-exporter-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
resources:
openstack-exporter-image: ghcr.io/canonical/openstack-exporter:1.6.0-7533071
@ -97,7 +97,7 @@ applications:
charm: ch:horizon-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -109,7 +109,7 @@ applications:
charm: ch:masakari-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -167,4 +167,4 @@ relations:
- masakari:ingress-public
- - masakari:consul-management
- consul:consul-cluster
- consul:consul-cluster

16
tests/tempest/smoke.yaml.j2
View File

@ -40,7 +40,7 @@ applications:
charm: ch:ovn-central-k8s
channel: 24.03/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -54,7 +54,7 @@ applications:
charm: ch:ovn-relay-k8s
channel: 24.03/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -66,7 +66,7 @@ applications:
charm: ch:keystone-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -81,7 +81,7 @@ applications:
charm: ch:glance-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
storage:
@ -95,7 +95,7 @@ applications:
charm: ch:nova-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -110,7 +110,7 @@ applications:
charm: ch:placement-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:
@ -122,7 +122,7 @@ applications:
charm: ch:neutron-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
options:
@ -136,7 +136,7 @@ applications:
charm: ch:tempest-k8s
channel: 2024.1/edge
{% endif -%}
base: ubuntu@22.04
base: ubuntu@24.04
scale: 1
trust: true
resources:

4
tox.ini
View File

@ -60,10 +60,10 @@ deps = {[testenv:py3]deps}
commands =
{toxinidir}/run_tox.sh py310 {posargs}
[testenv:py311]
[testenv:py312]
deps = {[testenv:py3]deps}
commands =
{toxinidir}/run_tox.sh py311 {posargs}
{toxinidir}/run_tox.sh py312 {posargs}
[testenv:cover]
deps = {[testenv:py3]deps}

8
zuul.d/project-templates.yaml
View File

@ -2,7 +2,7 @@
name: openstack-python3-sunbeam-jobs
# NOTE(hemanth): This template is used in openstack sunbeam charms since
# stable/2023.1. The stable/2023.1 and stable/2023.2 charm branches
# support py310 unit tests and main support py310, py311 tests.
# support py310 unit tests and main support py310, py312 tests.
description: |
Runs unit tests for an OpenStack Sunbeam project under the CPython
version 3 releases designated for testing the latest release.
@ -15,7 +15,7 @@
- stable/2023.1
- stable/2023.2
- main
- openstack-tox-py311:
- openstack-tox-py312:
branches:
- main
gate:
@ -27,7 +27,7 @@
- stable/2023.1
- stable/2023.2
- main
- openstack-tox-py311:
- openstack-tox-py312:
branches:
- main
@ -215,4 +215,4 @@
- publish-charm-tempest-k8s:
nodeset: ubuntu-jammy
- publish-charm-watcher-k8s:
nodeset: ubuntu-jammy
nodeset: ubuntu-jammy