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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -67,7 +67,7 @@ then
ops_sunbeam_src_path="ops-sunbeam/ops_sunbeam" ops_sunbeam_src_path="ops-sunbeam/ops_sunbeam"
PYTHONPATH=$(python3 ./repository.py pythonpath) mypy ${ops_sunbeam_src_path} PYTHONPATH=$(python3 ./repository.py pythonpath) mypy ${ops_sunbeam_src_path}
elif [[ $1 =~ ^(py3|py310|py311)$ ]]; elif [[ $1 =~ ^(py3|py310|py312)$ ]];
then then
# Run py3 on ops-sunbeam # Run py3 on ops-sunbeam
@ -159,6 +159,6 @@ then
cp charms/$charm/${charm}.charm . || exit 1 cp charms/$charm/${charm}.charm . || exit 1
python3 repository.py -v clean $charm || exit 1 python3 repository.py -v clean $charm || exit 1
else 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 exit 1
fi fi

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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