diff --git a/.zuul.yaml b/.zuul.yaml index 7ffc71c..23bf5f6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-yoga-jobs + - openstack-python3-charm-zed-jobs - openstack-cover-jobs diff --git a/charmcraft.yaml b/charmcraft.yaml index 194893f..158de6c 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -31,27 +31,47 @@ parts: chmod +x src/charm.py bases: - - name: ubuntu - channel: "20.04" - architectures: [amd64] - - name: ubuntu - channel: "20.04" - architectures: [arm64] - - name: ubuntu - channel: "20.04" - architectures: [ppc64el] - - name: ubuntu - channel: "20.04" - architectures: [s390x] - - name: ubuntu - channel: "22.04" - architectures: [amd64] - - name: ubuntu - channel: "22.04" - architectures: [arm64] - - name: ubuntu - channel: "22.04" - architectures: [ppc64el] - - name: ubuntu - channel: "22.04" - architectures: [s390x] + - build-on: + - name: ubuntu + channel: "22.04" + architectures: [amd64] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [amd64] + - name: ubuntu + channel: "22.10" + architectures: [amd64] + - build-on: + - name: ubuntu + channel: "22.04" + architectures: [arm64] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [arm64] + - name: ubuntu + channel: "22.10" + architectures: [arm64] + - build-on: + - name: ubuntu + channel: "22.04" + architectures: [ppc64el] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [ppc64el] + - name: ubuntu + channel: "22.10" + architectures: [ppc64el] + - build-on: + - name: ubuntu + channel: "22.04" + architectures: [s390x] + run-on: + - name: ubuntu + channel: "22.04" + architectures: [s390x] + - name: ubuntu + channel: "22.10" + architectures: [s390x] diff --git a/osci.yaml b/osci.yaml index 0311589..3c85099 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,9 +1,7 @@ - project: templates: - - charm-unit-jobs-py38 - charm-unit-jobs-py310 - - charm-xena-functional-jobs - - charm-yoga-functional-jobs + - charm-zed-functional-jobs vars: needs_charm_build: true charm_build_name: masakari-monitors diff --git a/requirements.txt b/requirements.txt index 7755b95..218e4a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,28 +3,7 @@ # choices of *requirements.txt files for OpenStack Charms: # https://github.com/openstack-charmers/release-tools # -# 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 -setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 -# 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 - -# Build requirements -cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. -git+https://github.com/juju/charm-tools#egg=charm-tools +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/metadata.yaml b/src/metadata.yaml index cc7801d..5f499e8 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -7,8 +7,8 @@ description: | tags: - openstack series: -- focal - jammy +- kinetic requires: identity-credentials: interface: keystone-credentials diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 679e760..a773733 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -69,8 +69,6 @@ applications: mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 - options: - source: *openstack-origin to: - '0' - '1' @@ -85,7 +83,7 @@ applications: worker-multiplier: 0.25 to: - '3' - channel: yoga/edge + channel: latest/edge cinder: charm: ch:cinder @@ -96,7 +94,7 @@ applications: glance-api-version: 2 to: - '4' - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone @@ -107,7 +105,7 @@ applications: worker-multiplier: 0.25 to: - '5' - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -120,7 +118,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -131,12 +129,12 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: yoga/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -148,7 +146,7 @@ applications: debug: true to: - '23' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -169,7 +167,7 @@ applications: - '8' - '9' - '10' - channel: yoga/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -187,7 +185,7 @@ applications: - '12' - '13' - '14' - channel: yoga/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon @@ -199,7 +197,7 @@ applications: - '15' - '16' - '17' - channel: quincy/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd @@ -213,14 +211,14 @@ applications: - '18' - '19' - '20' - channel: quincy/edge + channel: latest/edge cinder-ceph: charm: ch:cinder-ceph - channel: yoga/edge + channel: latest/edge masakari-monitors: - charm: ../../../masakari-monitors_ubuntu-22.04-amd64.charm + charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm hacluster: charm: ch:hacluster @@ -234,6 +232,7 @@ applications: options: enable-stonith: False enable-resources: False + channel: latest/edge vault: num_units: 1 @@ -249,7 +248,7 @@ applications: openstack-origin: *openstack-origin to: - '22' - channel: yoga/edge + channel: latest/edge relations: diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/jammy-zed.yaml similarity index 94% rename from src/tests/bundles/focal-yoga.yaml rename to src/tests/bundles/jammy-zed.yaml index a653050..4015a23 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -1,9 +1,9 @@ variables: - openstack-origin: &openstack-origin cloud:focal-yoga + openstack-origin: &openstack-origin cloud:jammy-zed local_overlay_enabled: True -series: focal +series: jammy comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -69,8 +69,6 @@ applications: mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 - options: - source: *openstack-origin to: - '0' - '1' @@ -85,7 +83,7 @@ applications: worker-multiplier: 0.25 to: - '3' - channel: yoga/edge + channel: latest/edge cinder: charm: ch:cinder @@ -96,7 +94,7 @@ applications: glance-api-version: 2 to: - '4' - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone @@ -107,7 +105,7 @@ applications: worker-multiplier: 0.25 to: - '5' - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -120,7 +118,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -131,12 +129,12 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: yoga/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -148,7 +146,7 @@ applications: debug: true to: - '23' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -169,7 +167,7 @@ applications: - '8' - '9' - '10' - channel: yoga/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -187,7 +185,7 @@ applications: - '12' - '13' - '14' - channel: yoga/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon @@ -199,7 +197,7 @@ applications: - '15' - '16' - '17' - channel: quincy/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd @@ -213,14 +211,14 @@ applications: - '18' - '19' - '20' - channel: quincy/edge + channel: latest/edge cinder-ceph: charm: ch:cinder-ceph - channel: yoga/edge + channel: latest/edge masakari-monitors: - charm: ../../../masakari-monitors_ubuntu-20.04-amd64.charm + charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm hacluster: charm: ch:hacluster @@ -234,6 +232,7 @@ applications: options: enable-stonith: False enable-resources: False + channel: latest/edge vault: num_units: 1 @@ -249,7 +248,7 @@ applications: openstack-origin: *openstack-origin to: - '22' - channel: yoga/edge + channel: latest/edge relations: diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/kinetic-zed.yaml similarity index 94% rename from src/tests/bundles/focal-xena.yaml rename to src/tests/bundles/kinetic-zed.yaml index 715f9c8..3dbba00 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/kinetic-zed.yaml @@ -1,9 +1,9 @@ variables: - openstack-origin: &openstack-origin cloud:focal-xena + openstack-origin: &openstack-origin distro local_overlay_enabled: True -series: focal +series: kinetic comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -69,8 +69,6 @@ applications: mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 - options: - source: *openstack-origin to: - '0' - '1' @@ -85,7 +83,7 @@ applications: worker-multiplier: 0.25 to: - '3' - channel: yoga/edge + channel: latest/edge cinder: charm: ch:cinder @@ -96,7 +94,7 @@ applications: glance-api-version: 2 to: - '4' - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone @@ -107,7 +105,7 @@ applications: worker-multiplier: 0.25 to: - '5' - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -120,7 +118,7 @@ applications: worker-multiplier: 0.25 to: - '6' - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -131,12 +129,12 @@ applications: worker-multiplier: 0.25 to: - '7' - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 - channel: yoga/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -148,7 +146,7 @@ applications: debug: true to: - '23' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -169,7 +167,7 @@ applications: - '8' - '9' - '10' - channel: yoga/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -187,7 +185,7 @@ applications: - '12' - '13' - '14' - channel: yoga/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon @@ -199,7 +197,7 @@ applications: - '15' - '16' - '17' - channel: quincy/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd @@ -213,14 +211,14 @@ applications: - '18' - '19' - '20' - channel: quincy/edge + channel: latest/edge cinder-ceph: charm: ch:cinder-ceph - channel: yoga/edge + channel: latest/edge masakari-monitors: - charm: ../../../masakari-monitors_ubuntu-20.04-amd64.charm + charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm hacluster: charm: ch:hacluster @@ -234,6 +232,7 @@ applications: options: enable-stonith: False enable-resources: False + channel: latest/edge vault: num_units: 1 @@ -249,7 +248,7 @@ applications: openstack-origin: *openstack-origin to: - '22' - channel: yoga/edge + channel: latest/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index c0187df..6607aa6 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -13,17 +13,17 @@ configure: - zaza.openstack.charm_tests.masakari.setup.create_segments gate_bundles: - - focal-xena - - impish-xena + - jammy-yoga dev_bundles: # Rocky disabled until https://review.opendev.org/#/c/647756/ lands in # packaging - - focal-yoga - jammy-yoga + - jammy-zed + - kinetic-zed smoke_bundles: - - focal-xena + - jammy-yoga target_deploy_status: easyrsa: @@ -44,5 +44,4 @@ target_deploy_status: tests_options: force_deploy: - - impish-xena - - jammy-yoga + - kinetic-zed diff --git a/test-requirements.txt b/test-requirements.txt index a11a7d0..a7936e6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,6 @@ # https://github.com/openstack-charmers/release-tools # pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. -cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 stestr>=2.2.0 @@ -13,25 +12,10 @@ stestr>=2.2.0 # https://github.com/mtreinish/stestr/issues/145 cliff<3.0.0 -# Dependencies of stestr. Newer versions use keywords that didn't exist in -# python 3.5 yet (e.g. "ModuleNotFoundError") -importlib-metadata<3.0.0; python_version < '3.6' -importlib-resources<3.0.0; python_version < '3.6' - -# Some Zuul nodes sometimes pull newer versions of these dependencies which -# dropped support for python 3.5: -osprofiler<2.7.0;python_version<'3.6' -stevedore<1.31.0;python_version<'3.6' -debtcollector<1.22.0;python_version<'3.6' -oslo.utils<=3.41.0;python_version<'3.6' - requests>=2.18.4 charms.reactive -# Newer mock seems to have some syntax which is newer than python3.5 (e.g. -# f'{something}' -mock>=1.2,<4.0.0; python_version < '3.6' -mock>=1.2; python_version >= '3.6' +mock>=1.2 nose>=1.3.7 coverage>=3.6 diff --git a/tox.ini b/tox.ini index e649e6a..6df34e5 100644 --- a/tox.ini +++ b/tox.ini @@ -19,10 +19,8 @@ minversion = 3.18.0 setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 TERM=linux - LAYER_PATH={toxinidir}/layers - INTERFACE_PATH={toxinidir}/interfaces JUJU_REPOSITORY={toxinidir}/build -passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY +passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY install_command = {toxinidir}/pip.sh install {opts} {packages} allowlist_externals = @@ -54,21 +52,6 @@ basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} -[testenv:py36] -basepython = python3.6 -deps = -r{toxinidir}/test-requirements.txt -commands = stestr run --slowest {posargs} - -[testenv:py38] -basepython = python3.8 -deps = -r{toxinidir}/test-requirements.txt -commands = stestr run --slowest {posargs} - -[testenv:py39] -basepython = python3.9 -deps = -r{toxinidir}/test-requirements.txt -commands = stestr run --slowest {posargs} - [testenv:py310] basepython = python3.10 deps = -r{toxinidir}/test-requirements.txt