From 248a7e217cce7df3552c8e9bc8c489b69361ef08 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 10 Jun 2022 20:14:48 +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: I506c53b4956024066bc769665525cb022438a0ae --- .zuul.yaml | 2 +- charmcraft.yaml | 8 +- metadata.yaml | 1 - osci.yaml | 70 +----- test-requirements.txt | 3 +- tests/bundles/focal-wallaby.yaml | 228 ------------------ tests/bundles/focal-xena.yaml | 228 ------------------ tests/bundles/focal-yoga.yaml | 228 ------------------ tests/bundles/jammy-yoga.yaml | 16 +- .../{focal-victoria.yaml => jammy-zed.yaml} | 20 +- .../{focal-ussuri.yaml => kinetic-zed.yaml} | 18 +- tests/tests.yaml | 12 +- tox.ini | 7 +- 13 files changed, 46 insertions(+), 795 deletions(-) delete mode 100644 tests/bundles/focal-wallaby.yaml delete mode 100644 tests/bundles/focal-xena.yaml delete mode 100644 tests/bundles/focal-yoga.yaml rename tests/bundles/{focal-victoria.yaml => jammy-zed.yaml} (94%) rename tests/bundles/{focal-ussuri.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/charmcraft.yaml b/charmcraft.yaml index fd276f9..652ab74 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -22,12 +22,10 @@ parts: bases: - build-on: - name: ubuntu - channel: "20.04" + channel: "22.04" architectures: - amd64 - - s390x - - ppc64el - - arm64 run-on: - name: ubuntu - channel: "20.04" + channel: "22.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index be5d99f..a59a574 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -8,7 +8,6 @@ description: | tags: - openstack series: -- focal - jammy subordinate: true provides: diff --git a/osci.yaml b/osci.yaml index 6d0d422..d64d890 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,73 +1,9 @@ - project: templates: - - charm-yoga-unit-jobs - check: - jobs: - # NOTE(lourot): adding `focal-ussuri` manually to the list here instead - # of using `charm-ussuri-functional-jobs` as we don't support Bionic. - - jammy-yoga-nvidia-vgpu: - voting: false - - focal-yoga-nvidia-vgpu - - focal-xena-nvidia-vgpu - - focal-wallaby-nvidia-vgpu - - focal-victoria-nvidia-vgpu - - focal-ussuri-nvidia-vgpu + - charm-zed-unit-jobs + - charm-zed-functional-jobs vars: needs_charm_build: true charm_build_name: nova-compute-nvidia-vgpu build_type: charmcraft - -- job: - name: jammy-yoga-nvidia-vgpu - description: Run a functional test against jammy-yoga - parent: func-target - dependencies: &smoke-jobs - - focal-ussuri-nvidia-vgpu - vars: - tox_extra_args: jammy-yoga -- job: - name: focal-yoga-nvidia-vgpu - description: Run a functional test against focal-yoga - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-yoga -- job: - name: focal-xena-nvidia-vgpu - description: Run a functional test against focal-xena - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-xena -- job: - name: focal-wallaby-nvidia-vgpu - description: Run a functional test against focal-wallaby - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-wallaby -- job: - name: focal-victoria-nvidia-vgpu - description: Run a functional test against focal-victoria - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: focal-victoria -- job: - name: focal-ussuri-nvidia-vgpu - description: Run a functional test against focal-ussuri - parent: func-target - dependencies: - # The soft dependencies mean that if they are not configured to run - # they will be ignored. See - # https://github.com/openstack-charmers/zosci-config - - charm-build - - osci-lint - - name: tox-py36 - soft: true - - name: tox-py38 - soft: true - - name: tox-py39 - soft: true - vars: - tox_extra_args: focal-ussuri + charmcraft_channel: 2.0/stable diff --git a/test-requirements.txt b/test-requirements.txt index e6f71d3..170df5e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,7 @@ charm-tools>=2.4.4 coverage>=3.6 mock>=1.2 -flake8>=4.0.1; python_version >= '3.6' +flake8>=4.0.1 stestr>=2.2.0 requests>=2.18.4 psutil @@ -14,4 +14,3 @@ git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack pytz # workaround for 14.04 pip/tox pyudev # for ceph-* charm unit tests (not mocked?) -cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 4e57c4a..0000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,228 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - constraints: mem=4096M - '5': - '6': - '7': - '8': - '9': - '10': - constraints: mem=4096M cores=4 - -applications: - - 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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '4' - channel: yoga/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: yoga/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: yoga/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: yoga/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: yoga/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: yoga/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: yoga/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - channel: yoga/edge - - nova-compute-nvidia-vgpu: - charm: ../../nova-compute-nvidia-vgpu.charm - options: - vgpu-device-mappings: "{'nvidia-108': ['0000:c1:00.0']}" - -relations: - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'nova-compute:nova-vgpu' - - 'nova-compute-nvidia-vgpu:nova-vgpu' diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml deleted file mode 100644 index 50c79dc..0000000 --- a/tests/bundles/focal-xena.yaml +++ /dev/null @@ -1,228 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin cloud:focal-xena - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - constraints: mem=4096M - '5': - '6': - '7': - '8': - '9': - '10': - constraints: mem=4096M cores=4 - -applications: - - 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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '4' - channel: yoga/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: yoga/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: yoga/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: yoga/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: yoga/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: yoga/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: yoga/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - channel: yoga/edge - - nova-compute-nvidia-vgpu: - charm: ../../nova-compute-nvidia-vgpu.charm - options: - vgpu-device-mappings: "{'nvidia-108': ['0000:c1:00.0']}" - -relations: - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'nova-compute:nova-vgpu' - - 'nova-compute-nvidia-vgpu:nova-vgpu' diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml deleted file mode 100644 index 1606e2c..0000000 --- a/tests/bundles/focal-yoga.yaml +++ /dev/null @@ -1,228 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin cloud:focal-yoga - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - constraints: mem=4096M - '5': - '6': - '7': - '8': - '9': - '10': - constraints: mem=4096M cores=4 - -applications: - - 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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - debug: true - to: - - '4' - channel: yoga/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: yoga/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: yoga/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: yoga/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: yoga/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: yoga/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: yoga/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - channel: yoga/edge - - nova-compute-nvidia-vgpu: - charm: ../../nova-compute-nvidia-vgpu.charm - options: - vgpu-device-mappings: "{'nvidia-108': ['0000:c1:00.0']}" - -relations: - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'nova-compute:nova-vgpu' - - 'nova-compute-nvidia-vgpu:nova-vgpu' diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 8b65d57..d4fd181 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -72,7 +72,7 @@ applications: debug: true to: - '4' - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -84,7 +84,7 @@ applications: neutron-security-groups: true to: - '5' - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone @@ -93,7 +93,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: yoga/edge + channel: latest/edge glance: charm: ch:glance @@ -112,11 +112,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement @@ -125,7 +125,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: yoga/edge + channel: latest/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.charm diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/jammy-zed.yaml similarity index 94% rename from tests/bundles/focal-victoria.yaml rename to tests/bundles/jammy-zed.yaml index 82c32b1..35ec1ec 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/jammy-zed.yaml @@ -1,9 +1,9 @@ local_overlay_enabled: False variables: - openstack-origin: &openstack-origin cloud:focal-victoria + openstack-origin: &openstack-origin cloud:jammy-zed -series: focal +series: jammy comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -72,7 +72,7 @@ applications: debug: true to: - '4' - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -84,7 +84,7 @@ applications: neutron-security-groups: true to: - '5' - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone @@ -93,7 +93,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: yoga/edge + channel: latest/edge glance: charm: ch:glance @@ -112,11 +112,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement @@ -125,7 +125,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: yoga/edge + channel: latest/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.charm diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/kinetic-zed.yaml similarity index 95% rename from tests/bundles/focal-ussuri.yaml rename to tests/bundles/kinetic-zed.yaml index e0c48a9..9529485 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/kinetic-zed.yaml @@ -3,7 +3,7 @@ local_overlay_enabled: False variables: openstack-origin: &openstack-origin distro -series: focal +series: kinetic comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -72,7 +72,7 @@ applications: debug: true to: - '4' - channel: yoga/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -84,7 +84,7 @@ applications: neutron-security-groups: true to: - '5' - channel: yoga/edge + channel: latest/edge keystone: charm: ch:keystone @@ -93,7 +93,7 @@ applications: openstack-origin: *openstack-origin to: - '6' - channel: yoga/edge + channel: latest/edge neutron-gateway: charm: ch:neutron-gateway @@ -103,7 +103,7 @@ applications: bridge-mappings: physnet1:br-ex to: - '7' - channel: yoga/edge + channel: latest/edge glance: charm: ch:glance @@ -112,11 +112,11 @@ applications: openstack-origin: *openstack-origin to: - '8' - channel: yoga/edge + channel: latest/edge neutron-openvswitch: charm: ch:neutron-openvswitch - channel: yoga/edge + channel: latest/edge placement: charm: ch:placement @@ -125,7 +125,7 @@ applications: openstack-origin: *openstack-origin to: - '9' - channel: yoga/edge + channel: latest/edge nova-compute: charm: ch:nova-compute @@ -140,7 +140,7 @@ applications: debug: true to: - '10' - channel: yoga/edge + channel: latest/edge nova-compute-nvidia-vgpu: charm: ../../nova-compute-nvidia-vgpu.charm diff --git a/tests/tests.yaml b/tests/tests.yaml index eba385f..e100bf5 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,17 +1,15 @@ charm_name: nova-compute-nvidia-vgpu smoke_bundles: - - focal-ussuri + - jammy-yoga gate_bundles: - - focal-ussuri - - focal-victoria - - focal-wallaby - - focal-xena - - focal-yoga + - jammy-yoga dev_bundles: - jammy-yoga + - jammy-zed + - kinetic-zed configure: - zaza.openstack.charm_tests.glance.setup.add_cirros_image @@ -27,4 +25,4 @@ tests: tests_options: force_deploy: - - jammy-yoga + - kinetic-zed diff --git a/tox.ini b/tox.ini index b482d4f..97efae2 100644 --- a/tox.ini +++ b/tox.ini @@ -64,6 +64,11 @@ basepython = python3.9 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +[testenv:py310] +basepython = python3.10 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:py3] basepython = python3 deps = -r{toxinidir}/requirements.txt @@ -117,7 +122,7 @@ deps = -r{toxinidir}/build-requirements.txt # the old behaviour we rename the file at the end. commands = charmcraft clean - charmcraft -v build + charmcraft -v pack {toxinidir}/rename.sh [testenv:func-noop]