From 0b34e1b882c8e3f71af8f3d0efbdf39843d88c64 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 10 Jun 2022 20:14:47 +0000 Subject: [PATCH] Add Kinetic and Zed support * sync charm-helpers to classic charms * change openstack-origin/source default to zed * align testing with zed * add new zed bundles * add zed bundles to tests.yaml * add zed tests to osci.yaml and .zuul.yaml * update build-on and run-on bases * add bindep.txt for py310 * sync tox.ini and requirements.txt for ruamel * use charmcraft_channel 2.0/stable * drop reactive plugin overrides * move interface/layer env vars to charmcraft.yaml Change-Id: I3cc0af8443ecf62589c88d4e924cb633c419e87f --- .zuul.yaml | 2 +- bindep.txt | 4 + charmcraft.yaml | 30 +- osci.yaml | 5 +- requirements.txt | 12 +- src/metadata.yaml | 4 +- src/tests/bundles/focal-yoga.yaml | 311 ------------------ src/tests/bundles/jammy-yoga.yaml | 28 +- .../{focal-xena.yaml => jammy-zed.yaml} | 32 +- .../{impish-xena.yaml => kinetic-zed.yaml} | 30 +- src/tests/tests.yaml | 15 +- test-requirements.txt | 18 +- tox.ini | 23 +- 13 files changed, 77 insertions(+), 437 deletions(-) create mode 100644 bindep.txt delete mode 100644 src/tests/bundles/focal-yoga.yaml rename src/tests/bundles/{focal-xena.yaml => jammy-zed.yaml} (94%) rename src/tests/bundles/{impish-xena.yaml => kinetic-zed.yaml} (95%) diff --git a/.zuul.yaml b/.zuul.yaml index fd20909..23bf5f6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-jobs + - openstack-python3-charm-zed-jobs - openstack-cover-jobs diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 0000000..17575d9 --- /dev/null +++ b/bindep.txt @@ -0,0 +1,4 @@ +libffi-dev [platform:dpkg] +libpq-dev [platform:dpkg] +libxml2-dev [platform:dpkg] +libxslt1-dev [platform:dpkg] diff --git a/charmcraft.yaml b/charmcraft.yaml index c9a0ed7..0604425 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -2,32 +2,24 @@ type: charm parts: charm: - build-packages: - - tox - - git - - python3-dev - override-build: | - apt-get install ca-certificates -y - tox -e build-reactive - override-stage: | - echo "Copying charm to staging area: $CHARMCRAFT_STAGE" - NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds) - cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/ - override-prime: | - # For some reason, the normal priming chokes on the fact that there's a - # hooks directory. - cp -r $CHARMCRAFT_STAGE/* . + source: src/ + plugin: reactive + build-snaps: + - charm + build-environment: + - CHARM_INTERFACES_DIR: /root/project/interfaces/ + - CHARM_LAYERS_DIR: /root/project/layers/ bases: - build-on: - name: ubuntu - channel: "20.04" + channel: "22.04" architectures: - amd64 run-on: - - name: ubuntu - channel: "20.04" - architectures: [amd64, s390x, ppc64el, arm64] - name: ubuntu channel: "22.04" architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "22.10" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/osci.yaml b/osci.yaml index f6cae66..40f3bf9 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,10 +1,9 @@ - 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: neutron-api-plugin-ironic build_type: charmcraft + charmcraft_channel: 2.0/stable diff --git a/requirements.txt b/requirements.txt index 7755b95..b3dc23f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,16 +15,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb # 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 ed45d0c..bd606c4 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -6,10 +6,10 @@ description: | tags: - misc - networking -subordinate: true series: -- focal - jammy +- kinetic +subordinate: true provides: neutron-plugin-api-subordinate: interface: neutron-plugin-api-subordinate diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml deleted file mode 100644 index 865ef6f..0000000 --- a/src/tests/bundles/focal-yoga.yaml +++ /dev/null @@ -1,311 +0,0 @@ -options: - source: &source cloud:focal-yoga -series: focal -local_overlay_enabled: false -relations: -- - nova-ironic - - ironic-api -- - ironic-conductor - - ironic-api -- - neutron-ironic-agent:identity-credentials - - keystone -- - neutron-ironic-agent - - neutron-api -- - neutron-openvswitch - - neutron-api -- - ironic-api:amqp - - rabbitmq-server:amqp -- - ironic-api - - keystone -- - ironic-api:shared-db - - ironic-api-mysql-router:shared-db -- - ironic-conductor:amqp - - rabbitmq-server:amqp -- - ironic-conductor - - keystone -- - ironic-conductor:shared-db - - ironic-conductor-mysql-router:shared-db -- - nova-ironic:amqp - - rabbitmq-server:amqp -- - nova-ironic - - glance -- - nova-ironic - - keystone -- - nova-ironic - - nova-cloud-controller -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - keystone:shared-db - - keystone-mysql-router:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - glance:identity-service - - keystone:identity-service -- - neutron-api:identity-service - - keystone:identity-service -- - neutron-api:shared-db - - neutron-api-mysql-router:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-gateway:neutron-plugin-api - - neutron-api:neutron-plugin-api -- - glance:shared-db - - glance-mysql-router:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:image-service - - glance:image-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - nova-cloud-controller:shared-db - - nova-cloud-controller-mysql-router:shared-db -- - nova-cloud-controller:neutron-api - - neutron-api:neutron-api -- - cinder:image-service - - glance:image-service -- - cinder:amqp - - rabbitmq-server:amqp -- - cinder:identity-service - - keystone:identity-service -- - cinder:cinder-volume-service - - nova-cloud-controller:cinder-volume-service -- - cinder:shared-db - - cinder-mysql-router:shared-db -- - placement:shared-db - - placement-mysql-router:shared-db -- - placement - - keystone -- - placement - - nova-cloud-controller -- - ceph-mon:client - - nova-ironic:ceph -- - ceph-mon:client - - glance:ceph -- - ceph-radosgw:mon - - ceph-mon:radosgw -- - ceph-radosgw:identity-service - - keystone:identity-service -- - ceph-osd:mon - - ceph-mon:osd -- - ceph-radosgw:object-store - - glance -- - mysql-innodb-cluster:db-router - - nova-cloud-controller-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - keystone-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - glance-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - neutron-api-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - placement-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - cinder-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - ironic-api-mysql-router:db-router -- - mysql-innodb-cluster:db-router - - ironic-conductor-mysql-router:db-router -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - vault:shared-db - - vault-mysql-router:shared-db -- - vault:certificates - - ceph-radosgw -- - vault:certificates - - cinder -- - vault:certificates - - glance:certificates -- - vault:certificates - - keystone:certificates -- - vault:certificates - - neutron-api:certificates -- - vault:certificates - - nova-cloud-controller:certificates -- - vault:certificates - - placement:certificates -- - vault - - ironic-conductor -- - vault:certificates - - ironic-api:certificates -- - ironic-api - - hacluster-ironic -services: - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - ironic-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - ironic-conductor-mysql-router: - charm: ch:mysql-router - channel: latest/edge - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - constraints: mem=4G - options: - source: *source - channel: latest/edge - cinder: - charm: ch:cinder - num_units: 1 - constraints: mem=2G - options: - block-device: vdb - glance-api-version: 2 - openstack-origin: *source - worker-multiplier: 0.25 - storage: - block-devices: cinder,50G - channel: yoga/edge - ceph-radosgw: - charm: ch:ceph-radosgw - num_units: 1 - constraints: mem=2G - options: - source: *source - namespace-tenants: True - channel: quincy/edge - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - constraints: mem=2G - options: - expected-osd-count: 3 - source: *source - channel: quincy/edge - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - constraints: mem=2G - options: - source: *source - storage: - osd-devices: 'cinder,30G' - channel: quincy/edge - glance: - charm: ch:glance - num_units: 1 - constraints: mem=2G - options: - openstack-origin: *source - worker-multiplier: 0.25 - channel: yoga/edge - keystone: - charm: ch:keystone - num_units: 1 - constraints: mem=2G - options: - openstack-origin: *source - worker-multiplier: 0.25 - channel: yoga/edge - neutron-api: - charm: ch:neutron-api - num_units: 1 - constraints: mem=2G - options: - flat-network-providers: "physnet1" - neutron-security-groups: true - openstack-origin: *source - manage-neutron-plugin-legacy-mode: false - worker-multiplier: 0.25 - channel: yoga/edge - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - constraints: mem=2G - options: - openstack-origin: *source - enable-isolated-metadata: true - enable-metadata-network: true - bridge-mappings: physnet1:br-ex - channel: yoga/edge - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - constraints: mem=2G - options: - network-manager: Neutron - openstack-origin: *source - worker-multiplier: 0.25 - channel: yoga/edge - nova-ironic: - charm: ch:nova-compute - num_units: 1 - constraints: mem=2G - options: - enable-live-migration: false - enable-resize: false - openstack-origin: *source - virt-type: ironic - channel: yoga/edge - placement: - charm: ch:placement - num_units: 1 - constraints: mem=2G - options: - openstack-origin: *source - worker-multiplier: 0.25 - channel: yoga/edge - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - constraints: mem=2G - channel: latest/edge - hacluster-ironic: - charm: ch:hacluster - num_units: 0 - channel: latest/edge - ironic-api: - charm: ch:ironic-api - num_units: 3 - constraints: mem=2G - options: - openstack-origin: *source - channel: yoga/edge - ironic-conductor: - charm: ch:ironic-conductor - num_units: 1 - constraints: mem=2G - options: - openstack-origin: *source - max-tftp-block-size: 1418 - disable-secure-erase: true - use-ipxe: true - enabled-network-interfaces: "flat, noop" - channel: yoga/edge - neutron-openvswitch: - charm: ch:neutron-openvswitch - num_units: 0 - options: - bridge-mappings: physnet1:br-ex - channel: yoga/edge - neutron-ironic-agent: - charm: ../../../neutron-api-plugin-ironic.charm - num_units: 0 - options: - openstack-origin: *source - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 34fb453..302eed2 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -177,7 +177,7 @@ services: worker-multiplier: 0.25 storage: block-devices: cinder,50G - channel: yoga/edge + channel: latest/edge ceph-radosgw: charm: ch:ceph-radosgw num_units: 1 @@ -185,7 +185,7 @@ services: options: source: *source namespace-tenants: True - channel: quincy/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -193,7 +193,7 @@ services: options: expected-osd-count: 3 source: *source - channel: quincy/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd num_units: 3 @@ -202,7 +202,7 @@ services: source: *source storage: osd-devices: 'cinder,30G' - channel: quincy/edge + channel: latest/edge glance: charm: ch:glance num_units: 1 @@ -210,7 +210,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone num_units: 1 @@ -218,7 +218,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api num_units: 1 @@ -229,7 +229,7 @@ services: openstack-origin: *source manage-neutron-plugin-legacy-mode: false worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway num_units: 1 @@ -239,7 +239,7 @@ services: enable-isolated-metadata: true enable-metadata-network: true bridge-mappings: physnet1:br-ex - channel: yoga/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -248,7 +248,7 @@ services: network-manager: Neutron openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge nova-ironic: charm: ch:nova-compute num_units: 1 @@ -258,7 +258,7 @@ services: enable-resize: false openstack-origin: *source virt-type: ironic - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement num_units: 1 @@ -266,7 +266,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 @@ -282,7 +282,7 @@ services: constraints: mem=2G options: openstack-origin: *source - channel: yoga/edge + channel: latest/edge ironic-conductor: charm: ch:ironic-conductor num_units: 1 @@ -293,13 +293,13 @@ services: disable-secure-erase: true use-ipxe: true enabled-network-interfaces: "flat, noop" - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 options: bridge-mappings: physnet1:br-ex - channel: yoga/edge + channel: latest/edge neutron-ironic-agent: charm: ../../../neutron-api-plugin-ironic.charm num_units: 0 diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/jammy-zed.yaml similarity index 94% rename from src/tests/bundles/focal-xena.yaml rename to src/tests/bundles/jammy-zed.yaml index 44f8739..79eeecd 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -1,6 +1,6 @@ options: - source: &source cloud:focal-xena -series: focal + source: &source cloud:jammy-zed +series: jammy local_overlay_enabled: false relations: - - nova-ironic @@ -177,7 +177,7 @@ services: worker-multiplier: 0.25 storage: block-devices: cinder,50G - channel: yoga/edge + channel: latest/edge ceph-radosgw: charm: ch:ceph-radosgw num_units: 1 @@ -185,7 +185,7 @@ services: options: source: *source namespace-tenants: True - channel: quincy/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -193,7 +193,7 @@ services: options: expected-osd-count: 3 source: *source - channel: quincy/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd num_units: 3 @@ -202,7 +202,7 @@ services: source: *source storage: osd-devices: 'cinder,30G' - channel: quincy/edge + channel: latest/edge glance: charm: ch:glance num_units: 1 @@ -210,7 +210,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone num_units: 1 @@ -218,7 +218,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api num_units: 1 @@ -229,7 +229,7 @@ services: openstack-origin: *source manage-neutron-plugin-legacy-mode: false worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway num_units: 1 @@ -239,7 +239,7 @@ services: enable-isolated-metadata: true enable-metadata-network: true bridge-mappings: physnet1:br-ex - channel: yoga/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -248,7 +248,7 @@ services: network-manager: Neutron openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge nova-ironic: charm: ch:nova-compute num_units: 1 @@ -258,7 +258,7 @@ services: enable-resize: false openstack-origin: *source virt-type: ironic - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement num_units: 1 @@ -266,7 +266,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 @@ -282,7 +282,7 @@ services: constraints: mem=2G options: openstack-origin: *source - channel: yoga/edge + channel: latest/edge ironic-conductor: charm: ch:ironic-conductor num_units: 1 @@ -293,13 +293,13 @@ services: disable-secure-erase: true use-ipxe: true enabled-network-interfaces: "flat, noop" - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 options: bridge-mappings: physnet1:br-ex - channel: yoga/edge + channel: latest/edge neutron-ironic-agent: charm: ../../../neutron-api-plugin-ironic.charm num_units: 0 diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/kinetic-zed.yaml similarity index 95% rename from src/tests/bundles/impish-xena.yaml rename to src/tests/bundles/kinetic-zed.yaml index 78e3992..90e48ee 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/kinetic-zed.yaml @@ -1,6 +1,6 @@ options: source: &source distro -series: impish +series: kinetic local_overlay_enabled: false relations: - - nova-ironic @@ -177,7 +177,7 @@ services: worker-multiplier: 0.25 storage: block-devices: cinder,50G - channel: yoga/edge + channel: latest/edge ceph-radosgw: charm: ch:ceph-radosgw num_units: 1 @@ -185,7 +185,7 @@ services: options: source: *source namespace-tenants: True - channel: quincy/edge + channel: latest/edge ceph-mon: charm: ch:ceph-mon num_units: 3 @@ -193,7 +193,7 @@ services: options: expected-osd-count: 3 source: *source - channel: quincy/edge + channel: latest/edge ceph-osd: charm: ch:ceph-osd num_units: 3 @@ -202,7 +202,7 @@ services: source: *source storage: osd-devices: 'cinder,30G' - channel: quincy/edge + channel: latest/edge glance: charm: ch:glance num_units: 1 @@ -210,7 +210,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone num_units: 1 @@ -218,7 +218,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api num_units: 1 @@ -229,7 +229,7 @@ services: openstack-origin: *source manage-neutron-plugin-legacy-mode: false worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway num_units: 1 @@ -239,7 +239,7 @@ services: enable-isolated-metadata: true enable-metadata-network: true bridge-mappings: physnet1:br-ex - channel: yoga/edge + channel: latest/edge nova-cloud-controller: charm: ch:nova-cloud-controller num_units: 1 @@ -248,7 +248,7 @@ services: network-manager: Neutron openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge nova-ironic: charm: ch:nova-compute num_units: 1 @@ -258,7 +258,7 @@ services: enable-resize: false openstack-origin: *source virt-type: ironic - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement num_units: 1 @@ -266,7 +266,7 @@ services: options: openstack-origin: *source worker-multiplier: 0.25 - channel: yoga/edge + channel: latest/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 @@ -282,7 +282,7 @@ services: constraints: mem=2G options: openstack-origin: *source - channel: yoga/edge + channel: latest/edge ironic-conductor: charm: ch:ironic-conductor num_units: 1 @@ -293,13 +293,13 @@ services: disable-secure-erase: true use-ipxe: true enabled-network-interfaces: "flat, noop" - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch num_units: 0 options: bridge-mappings: physnet1:br-ex - channel: yoga/edge + channel: latest/edge neutron-ironic-agent: charm: ../../../neutron-api-plugin-ironic.charm num_units: 0 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index b955eda..247f017 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -4,15 +4,15 @@ charm_name: ironic-api gate_bundles: -- focal-xena -- impish-xena - -dev_bundles: -- focal-yoga - jammy-yoga +dev_bundles: +- jammy-yoga +- jammy-zed +- kinetic-zed + smoke_bundles: -- focal-xena +- jammy-yoga target_deploy_status: vault: @@ -43,5 +43,4 @@ tests: 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 e22fe48..bdde110 100644 --- a/tox.ini +++ b/tox.ini @@ -31,10 +31,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 = @@ -50,7 +48,7 @@ basepython = python3 deps = -r{toxinidir}/build-requirements.txt commands = charmcraft clean - charmcraft -v build + charmcraft -v pack {toxinidir}/rename.sh [testenv:build-reactive] @@ -68,21 +66,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 @@ -91,7 +74,7 @@ commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 deps = flake8==3.9.2 - charm-tools==2.8.3 + git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests [testenv:func-target]