Fix charm build

Also removed EOL hirsute bits.

Change-Id: I04ae1e685c19ae6b5cc7cd3b2057d6f9829ef802

charmcraft.yaml

@@ -2,6 +2,11 @@ type: charm
 
 parts:
   charm:
+    charm-python-packages:
+      # NOTE(lourot: see
+      # * https://github.com/canonical/charmcraft/issues/551
+      # * https://github.com/canonical/charmcraft/issues/632
+      - setuptools < 58
     build-packages:
       - git
 

metadata.yaml

@@ -9,7 +9,6 @@ tags:
 - openstack
 series:
 - focal
-- hirsute
 - impish
 subordinate: true
 provides:

osci.yaml

@@ -8,7 +8,6 @@
         - jammy-yoga-nvidia-vgpu:
             voting: false
         - impish-xena-nvidia-vgpu
-        - hirsute-wallaby-nvidia-vgpu
         - focal-yoga-nvidia-vgpu
         - focal-xena-nvidia-vgpu
         - focal-wallaby-nvidia-vgpu
@@ -34,13 +33,6 @@
     dependencies: *smoke-jobs
     vars:
       tox_extra_args: impish-xena
-- job:
-    name: hirsute-wallaby-nvidia-vgpu
-    description: Run a functional test against hirsute-wallaby
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: hirsute-wallaby
 - job:
     name: focal-yoga-nvidia-vgpu
     description: Run a functional test against focal-yoga

requirements.txt

@@ -5,4 +5,10 @@ ops
 git+https://github.com/openstack/charm-ops-openstack#egg=ops_openstack
 
 ruamel.yaml
-pylspci
+
+# NOTE(lourot): we can't use `pylspci` from PyPI here as charmcraft will then
+# attempt a `pip install --no-binary :all: pylspci` and hit
+# https://gitlab.com/Lucidiot/pylspci/-/issues/21 . Pulling from source
+# instead. Also using a fork on GitHub because of not being able to access
+# GitLab behind a proxy:
+git+https://github.com/openstack-charmers/pylspci

tests/bundles/hirsute-wallaby.yaml

@@ -1,256 +0,0 @@
-local_overlay_enabled: False
-
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: hirsute
-
-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
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '11'
-      - '12'
-      - '13'
-      - '14'
-      - '15'
-      - '16'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '17'
-      - '18'
-      - '19'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '4'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/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'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '7'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '8'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/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
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-      libvirt-image-backend: rbd
-    to:
-      - '10'
-
-  nova-compute-nvidia-vgpu:
-    charm: ../../nova-compute-nvidia-vgpu.charm
-
-relations:
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'nova-compute:ceph'
-    - 'ceph-mon:client'
-
-  - - '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-compute-nvidia-vgpu'

tests/tests.yaml

@@ -9,7 +9,6 @@ gate_bundles:
   - focal-wallaby
   - focal-xena
   - focal-yoga
-  - hirsute-wallaby
   - impish-xena
 
 dev_bundles:
@@ -28,6 +27,5 @@ tests:
 
 tests_options:
   force_deploy:
-  - hirsute-wallaby
   - impish-xena
   - jammy-yoga

tox.ini

@@ -15,8 +15,12 @@ skip_missing_interpreters = False
 # * It is also necessary to pin virtualenv as a newer virtualenv would still
 #   lead to fetching the latest pip in the func* tox targets, see
 #   https://stackoverflow.com/a/38133283
+# * It is necessary to declare setuptools as a dependency otherwise tox will
+#   fail very early at not being able to load it. The version pinning is in
+#   line with `pip.sh`.
 requires = pip < 20.3
            virtualenv < 20.0
+           setuptools < 50.0.0
 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
 minversion = 3.2.0