From 3c9e6f10ba6985d2fa306786eb67ea9eb36a0ce0 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 18 Jul 2023 16:47:18 -0400 Subject: [PATCH] Add 2023.2 Bobcat support * sync charm-helpers to classic charms * change openstack-origin/source default to quincy * add mantic to metadata series * align testing with bobcat * add new bobcat bundles * add bobcat bundles to tests.yaml * add bobcat tests to osci.yaml * update build-on and run-on bases * drop kinetic * update charmcraft_channel to 2.x/stable Change-Id: Ibb97b427f29a061adc2d67e55ae3976387d332c7 --- charmcraft.yaml | 6 +++--- osci.yaml | 3 +-- requirements.txt | 19 ++++++++----------- src/config.yaml | 2 +- src/metadata.yaml | 2 +- .../{jammy-zed.yaml => jammy-bobcat.yaml} | 2 +- .../{kinetic-zed.yaml => mantic-bobcat.yaml} | 2 +- src/tests/tests.yaml | 4 +++- tox.ini | 1 - 9 files changed, 19 insertions(+), 22 deletions(-) rename src/tests/bundles/{jammy-zed.yaml => jammy-bobcat.yaml} (93%) rename src/tests/bundles/{kinetic-zed.yaml => mantic-bobcat.yaml} (97%) diff --git a/charmcraft.yaml b/charmcraft.yaml index 25b2873..3683b39 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/osci.yaml b/osci.yaml index f8e2ead..3d15efd 100644 --- a/osci.yaml +++ b/osci.yaml @@ -4,10 +4,9 @@ - charm-unit-jobs-py39 - charm-xena-functional-jobs - charm-yoga-functional-jobs - - charm-zed-functional-jobs - charm-functional-jobs vars: needs_charm_build: true charm_build_name: ceph-fs build_type: charmcraft - charmcraft_channel: 2.0/stable + charmcraft_channel: 2.x/stable diff --git a/requirements.txt b/requirements.txt index c539e82..b3dc23f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,16 +8,13 @@ # requirements.txt setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 -# Build requirements -cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. -charm-tools==2.8.4 +# NOTE: newer versions of cryptography require a Rust compiler to build, +# see +# * https://github.com/openstack-charmers/zaza/issues/421 +# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html +# +cryptography<3.4 + +git+https://github.com/juju/charm-tools.git simplejson - -# Newer versions use keywords that didn't exist in python 3.5 yet (e.g. -# "ModuleNotFoundError") -# NOTE(lourot): This might look like a duplication of test-requirements.txt but -# some tox targets use only test-requirements.txt whereas charm-build uses only -# requirements.txt -importlib-metadata<3.0.0; python_version < '3.6' -importlib-resources<3.0.0; python_version < '3.6' diff --git a/src/config.yaml b/src/config.yaml index f2af93a..58ce4db 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -5,7 +5,7 @@ options: description: Mon and OSD debug level. Max is 20. source: type: string - default: yoga + default: quincy description: | Optional configuration to support use of additional sources such as: . diff --git a/src/metadata.yaml b/src/metadata.yaml index cb2dca3..94bc2f8 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,8 +12,8 @@ tags: series: - focal - jammy -- kinetic - lunar +- mantic subordinate: false requires: ceph-mds: diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-bobcat.yaml similarity index 93% rename from src/tests/bundles/jammy-zed.yaml rename to src/tests/bundles/jammy-bobcat.yaml index 04bfb37..09ab531 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -1,5 +1,5 @@ variables: - openstack-origin: &openstack-origin cloud:jammy-zed + openstack-origin: &openstack-origin cloud:jammy-bobcat local_overlay_enabled: False diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/mantic-bobcat.yaml similarity index 97% rename from src/tests/bundles/kinetic-zed.yaml rename to src/tests/bundles/mantic-bobcat.yaml index c976a4a..3456d8c 100644 --- a/src/tests/bundles/kinetic-zed.yaml +++ b/src/tests/bundles/mantic-bobcat.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: False -series: &series kinetic +series: &series mantic applications: ubuntu: # used to test mounts diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 08aef01..a554e97 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -3,6 +3,8 @@ gate_bundles: - focal-xena - focal-yoga - jammy-yoga + - jammy-bobcat + - mantic-bobcat smoke_bundles: - focal-xena # configure: @@ -19,4 +21,4 @@ tests: target_deploy_status: ubuntu: workload-status: active - workload-status-message-prefix: '' \ No newline at end of file + workload-status-message-prefix: '' diff --git a/tox.ini b/tox.ini index 9ae404d..50527f5 100644 --- a/tox.ini +++ b/tox.ini @@ -97,7 +97,6 @@ commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - charm-tools==2.8.4 commands = flake8 {posargs} src unit_tests [testenv:func-target]