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: Idf4a6cd1e0888576f890b00aa5b343936900d6dd
Depends-On: https://review.opendev.org/c/openstack/charm-ironic-conductor/+/858752

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-jobs
+      - openstack-python3-charm-zed-jobs
       - openstack-cover-jobs

charmcraft.yaml

@@ -31,27 +31,47 @@ parts:
       chmod +x src/charm.py
 
 bases:
-  - name: ubuntu
+  - build-on:
-    channel: "20.04"
+      - name: ubuntu
-    architectures: [amd64]
+        channel: "22.04"
-  - name: ubuntu
+        architectures: [amd64]
-    channel: "20.04"
+    run-on:
-    architectures: [arm64]
+      - name: ubuntu
-  - name: ubuntu
+        channel: "22.04"
-    channel: "20.04"
+        architectures: [amd64]
-    architectures: [ppc64el]
+      - name: ubuntu
-  - name: ubuntu
+        channel: "22.10"
-    channel: "20.04"
+        architectures: [amd64]
-    architectures: [s390x]
+  - build-on:
-  - name: ubuntu
+      - name: ubuntu
-    channel: "22.04"
+        channel: "22.04"
-    architectures: [amd64]
+        architectures: [arm64]
-  - name: ubuntu
+    run-on:
-    channel: "22.04"
+      - name: ubuntu
-    architectures: [arm64]
+        channel: "22.04"
-  - name: ubuntu
+        architectures: [arm64]
-    channel: "22.04"
+      - name: ubuntu
-    architectures: [ppc64el]
+        channel: "22.10"
-  - name: ubuntu
+        architectures: [arm64]
-    channel: "22.04"
+  - build-on:
-    architectures: [s390x]
+      - 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]

osci.yaml

@@ -1,9 +1,7 @@
 - project:
     templates:
-      - charm-unit-jobs-py38
       - charm-unit-jobs-py310
-      - charm-xena-functional-jobs
+      - charm-zed-functional-jobs
-      - charm-yoga-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: ironic-conductor

requirements.txt

@@ -5,15 +5,6 @@
 #
 
 # 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.git
-git+https://github.com/juju/charm-tools#egg=charm-tools
 
 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'

src/config.yaml

@@ -1,6 +1,6 @@
 options:
   openstack-origin:
-    default: yoga
+    default: zed
     type: string
     description: |
       Repository from which to install. May be one of the following:

src/metadata.yaml

@@ -13,8 +13,8 @@ tags:
 - openstack
 - baremetal
 series:
-- focal
 - jammy
+- kinetic
 extra-bindings:
   deployment:
   cleaning:

src/tests/bundles/jammy-yoga.yaml

@@ -283,7 +283,7 @@ services:
       openstack-origin: *source
     channel: latest/edge
   ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-22.04-amd64.charm
+    charm: ../../../ironic-conductor_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
     num_units: 1
     constraints: mem=2G
     options:

src/tests/bundles/jammy-zed.yaml

@@ -1,8 +1,8 @@
 local_overlay_enabled: False
 
 options:
-  source: &source cloud:focal-yoga
+  source: &source cloud:jammy-zed
-series: focal
+series: jammy
 relations:
 - - nova-ironic
   - ironic-api
@@ -283,7 +283,7 @@ services:
       openstack-origin: *source
     channel: latest/edge
   ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-20.04-amd64.charm
+    charm: ../../../ironic-conductor_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
     num_units: 1
     constraints: mem=2G
     options:

src/tests/bundles/kinetic-zed.yaml

@@ -1,9 +1,8 @@
 local_overlay_enabled: False
 
 options:
-  source: &source cloud:focal-xena
+  source: &source distro
-series: focal
+series: kinetic
-
 relations:
 - - nova-ironic
   - ironic-api
@@ -284,7 +283,7 @@ services:
       openstack-origin: *source
     channel: latest/edge
   ironic-conductor:
-    charm: ../../../ironic-conductor_ubuntu-20.04-amd64.charm
+    charm: ../../../ironic-conductor_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
     num_units: 1
     constraints: mem=2G
     options:

src/tests/tests.yaml

@@ -4,14 +4,15 @@
 charm_name: ironic-api
 
 gate_bundles:
-- focal-xena
-
-dev_bundles:
-- focal-yoga
 - jammy-yoga
 
+dev_bundles:
+- jammy-yoga
+- jammy-zed
+- kinetic-zed
+
 smoke_bundles:
-  - focal-xena
+  - focal-yoga
 
 target_deploy_status:
   vault:
@@ -38,4 +39,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - jammy-yoga
+    - kinetic-zed

src/wheelhouse.txt

@@ -17,7 +17,7 @@ zipp < 2.0.0
 # on the machine during install, this breaks installs.  Instead pin to <3.4 until a solution can be
 # found that doesn't require compiling on the target machine.
 # LP: #1915171
-cryptography<3.4
+cryptography
 pyrsistent<0.18.0
 iso8601<1.0.0
 

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