Add charmcraft 3 support

Update the charmcraft.yaml file to use base and platforms, only
allowing noble support.

- Update osci.yaml to use the charmcraft 3.x/beta
- Drop non-noble tests
- Add temporary override for charms.reactive in wheelhouse.txt

Change-Id: I1d1bbdd60cc247874d97dfc0ee749f2cec3ccfd2

charmcraft.yaml

@@ -5,84 +5,34 @@ parts:
     source: src/
     plugin: reactive
     reactive-charm-build-arguments:
-      - --binary-wheels-from-source
+    - --binary-wheels-from-source
-      - -v
+    - -v
     build-packages:
-      - git
+    - git
-      - python3-dev
+    - python3-dev
-      - libffi-dev
+    - libffi-dev
-      - libssl-dev
+    - libssl-dev
-      - rustc
+    - rustc
-      - cargo
+    - cargo
     build-snaps:
-      - charm
+    - charm/latest/edge
     build-environment:
-      - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
+    - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/
-      - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
+    - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/
-      - MAKEFLAGS: -j$(nproc)
+    - MAKEFLAGS: -j$(nproc)
-      - CARGO_HTTP_MULTIPLEXING: "false"
+    - CARGO_HTTP_MULTIPLEXING: 'false'
-bases:
+
-  - build-on:
+base: ubuntu@24.04
-      - name: ubuntu
+platforms:
-        channel: "22.04"
+  amd64:
-        architectures: [amd64]
+    build-on: amd64
-    run-on:
+    build-for: amd64
-      - name: ubuntu
+  arm64:
-        channel: "22.04"
+    build-on: arm64
-        architectures: [amd64]
+    build-for: arm64
-  - build-on:
+  ppc64el:
-      - name: ubuntu
+    build-on: ppc64el
-        channel: "22.04"
+    build-for: ppc64el
-        architectures: [s390x]
+  s390x:
-    run-on:
+    build-on: s390x
-      - name: ubuntu
+    build-for: s390x
-        channel: "22.04"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "22.04"
-        architectures: [arm64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [amd64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [s390x]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "23.10"
-        architectures: [arm64]

osci.yaml

@@ -6,4 +6,4 @@
       needs_charm_build: true
       charm_build_name: ovn-chassis
       build_type: charmcraft
-      charmcraft_channel: 2.2/stable
+      charmcraft_channel: 3.x/beta

src/tests/bundles/jammy-bobcat.yaml

@@ -1,53 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
-
-local_overlay_enabled: False
-
-series: jammy
-
-applications:
-
-  vault:
-    charm: ch:vault
-    num_units: 1
-    # The vault raft support is currently only available for jammy
-    series: jammy
-    channel: latest/edge
-
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-
-  magpie:
-    # By default, when instance NUMA placement is not specified,
-    # a topology of N sockets, each with one core and one thread,
-    # is used for an instance, where N corresponds to the number of
-    # instance vCPUs requested.
-    #
-    # Let's use a 8 VCPU 2 socket flavor for low level tests
-    constraints: "instance-type=twosocketm1.xlarge"
-    charm: ch:magpie
-    num_units: 2
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-
-  ovn-chassis:
-    charm: ../../../ovn-chassis_ubuntu-22.04-amd64.charm
-
-relations:
-
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-
-  - - 'magpie:juju-info'
-    - 'ovn-chassis:juju-info'
-
-  - - 'ovn-chassis:ovsdb'
-    - 'ovn-central:ovsdb'
-
-  - - 'ovn-chassis:certificates'
-    - 'vault:certificates'

src/tests/bundles/jammy-caracal.yaml

@@ -1,53 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-caracal
-
-local_overlay_enabled: False
-
-series: jammy
-
-applications:
-
-  vault:
-    charm: ch:vault
-    num_units: 1
-    # The vault raft support is currently only available for jammy
-    series: jammy
-    channel: latest/edge
-
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-
-  magpie:
-    # By default, when instance NUMA placement is not specified,
-    # a topology of N sockets, each with one core and one thread,
-    # is used for an instance, where N corresponds to the number of
-    # instance vCPUs requested.
-    #
-    # Let's use a 8 VCPU 2 socket flavor for low level tests
-    constraints: "instance-type=twosocketm1.xlarge"
-    charm: ch:magpie
-    num_units: 2
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-
-  ovn-chassis:
-    charm: ../../../ovn-chassis_ubuntu-22.04-amd64.charm
-
-relations:
-
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-
-  - - 'magpie:juju-info'
-    - 'ovn-chassis:juju-info'
-
-  - - 'ovn-chassis:ovsdb'
-    - 'ovn-central:ovsdb'
-
-  - - 'ovn-chassis:certificates'
-    - 'vault:certificates'

src/tests/bundles/noble-caracal.yaml

@@ -1,17 +1,16 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin caracal
 
 local_overlay_enabled: False
 
-series: mantic
+series: noble
 
 applications:
 
   vault:
     charm: ch:vault
     num_units: 1
-    # The vault raft support is currently only available for jammy
+    series: noble
-    series: jammy
     channel: latest/edge
 
   ovn-central:
@@ -36,7 +35,7 @@ applications:
     channel: latest/edge
 
   ovn-chassis:
-    charm: ../../../ovn-chassis_ubuntu-23.10-amd64.charm
+    charm: ../../../ovn-chassis_amd64.charm
 
 relations:
 

src/tests/tests.yaml

@@ -1,15 +1,13 @@
 charm_name: ovn-chassis
 
 gate_bundles:
-- jammy-caracal
+- noble-caracal
 
 smoke_bundles:
-- jammy-caracal
+- noble-caracal
 
 dev_bundles:
-- jammy-bobcat
+- noble-caracal
-- jammy-caracal
-- mantic-bobcat
 
 target_deploy_status:
   magpie:
@@ -41,6 +39,3 @@ tests:
 - zaza.openstack.charm_tests.ovn.tests.ChassisCharmOperationTest
 - zaza.openstack.charm_tests.ovn.tests.DPDKTest
 
-tests_options:
-  force_deploy:
-    - mantic-bobcat

src/wheelhouse.txt

@@ -1,4 +1,6 @@
 
+git+https://github.com/wolsen/charms.reactive.git@fix-entry-points#egg=charms.reactive
+
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
 
 git+https://github.com/juju/charm-helpers.git#egg=charmhelpers

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.
-setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 stestr>=2.2.0