diff --git a/charmcraft.yaml b/charmcraft.yaml index ae4e297..71f50dd 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -33,9 +33,9 @@ bases: - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "22.10" - architectures: [amd64, s390x, ppc64el, arm64] - name: ubuntu channel: "23.04" architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "23.10" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/config.yaml b/config.yaml index 00c53bc..fd6c333 100644 --- a/config.yaml +++ b/config.yaml @@ -10,7 +10,7 @@ options: source: type: string - default: yoga + default: quincy description: | Optional configuration to support use of additional sources such as: - ppa:myteam/ppa diff --git a/metadata.yaml b/metadata.yaml index 9a583a1..76f85c2 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -10,8 +10,8 @@ tags: series: - focal - jammy - - kinetic - lunar + - mantic subordinate: false min-juju-version: 2.7.6 extra-bindings: @@ -24,4 +24,4 @@ requires: scope: container peers: cluster: - interface: ceph-nfs-peer \ No newline at end of file + interface: ceph-nfs-peer diff --git a/osci.yaml b/osci.yaml index 8002eaf..7500386 100644 --- a/osci.yaml +++ b/osci.yaml @@ -7,12 +7,13 @@ - focal-pacific - focal-quincy - jammy-quincy - - kinetic-quincy - lunar-quincy + - mantic-quincy vars: needs_charm_build: true charm_build_name: ceph-nfs build_type: charmcraft + charmcraft_channel: 2.x/stable - job: name: focal-pacific parent: func-target @@ -40,13 +41,6 @@ - focal-quincy vars: tox_extra_args: -- jammy-quincy -- job: - name: kinetic-quincy - parent: func-target - dependencies: - - focal-quincy - vars: - tox_extra_args: -- kinetic-quincy - job: name: lunar-quincy parent: func-target @@ -55,4 +49,11 @@ - focal-quincy vars: tox_extra_args: -- lunar-quincy - \ No newline at end of file +- job: + name: mantic-quincy + parent: func-target + voting: false + dependencies: + - focal-quincy + vars: + tox_extra_args: -- mantic-quincy diff --git a/tests/bundles/kinetic-quincy.yaml b/tests/bundles/mantic-quincy.yaml similarity index 89% rename from tests/bundles/kinetic-quincy.yaml rename to tests/bundles/mantic-quincy.yaml index 669cb91..0f8616c 100644 --- a/tests/bundles/kinetic-quincy.yaml +++ b/tests/bundles/mantic-quincy.yaml @@ -1,5 +1,6 @@ local_overlay_enabled: False -series: jammy +series: mantic +jammy applications: ubuntu: charm: cs:ubuntu @@ -11,7 +12,7 @@ applications: source: distro ceph-osd: charm: ch:ceph-osd - channel: quincy/edge + channel: latest/edge num_units: 3 storage: osd-devices: '2,10G' @@ -19,7 +20,7 @@ applications: source: distro ceph-mon: charm: ch:ceph-mon - channel: quincy/edge + channel: latest/edge num_units: 3 options: monitor-count: '3' @@ -27,7 +28,7 @@ applications: source: distro ceph-fs: charm: ch:ceph-fs - channel: quincy/edge + channel: latest/edge num_units: 2 options: source: distro diff --git a/tests/tests.yaml b/tests/tests.yaml index fe66ba0..cd8f59e 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -3,6 +3,7 @@ gate_bundles: - focal-quincy - focal-pacific - jammy-pacific + - mantic-quincy smoke_bundles: - focal-pacific configure: [] diff --git a/tox.ini b/tox.ini index c278ef6..c855061 100644 --- a/tox.ini +++ b/tox.ini @@ -118,7 +118,7 @@ basepython = python3 deps = -r{toxinidir}/build-requirements.txt commands = charmcraft clean - charmcraft -v build + charmcraft -v pack {toxinidir}/rename.sh [testenv:func-noop] @@ -148,4 +148,4 @@ commands = [flake8] # Ignore E902 because the unit_tests directory is missing in the built charm. -ignore = E402,E226,E902 \ No newline at end of file +ignore = E402,E226,E902