From 74f2aa702cf11c597d74a915a5e8d626d2241912 Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Fri, 21 Jun 2024 19:20:26 -0700 Subject: [PATCH] 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 - Add noble/oracular to charmhelpers - Drop non-noble tests Change-Id: I20fae8598cb4ec4b6464131024b1c27a8ca24e65 --- charmcraft.yaml | 104 +++++------------- osci.yaml | 2 +- requirements.txt | 1 - src/config.yaml | 2 +- ...{jammy-caracal.yaml => noble-caracal.yaml} | 6 +- src/tests/tests.yaml | 11 +- src/wheelhouse.txt | 3 +- test-requirements.txt | 1 - 8 files changed, 36 insertions(+), 94 deletions(-) rename src/tests/bundles/{jammy-caracal.yaml => noble-caracal.yaml} (68%) diff --git a/charmcraft.yaml b/charmcraft.yaml index 5aa4b1b..b8aba2e 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -5,83 +5,33 @@ parts: source: src/ plugin: reactive reactive-charm-build-arguments: - - --binary-wheels-from-source - - -v + - --binary-wheels-from-source + - -v build-packages: - - git - - python3-dev - - libffi-dev - - libssl-dev - - rustc - - cargo + - git + - python3-dev + - libffi-dev + - libssl-dev + - rustc + - cargo build-snaps: - - charm + - charm/latest/edge build-environment: - - CHARM_INTERFACES_DIR: /root/project/interfaces/ - - CHARM_LAYERS_DIR: /root/project/layers/ - - MAKEFLAGS: -j$(nproc) -bases: - - build-on: - - name: ubuntu - channel: "22.04" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "22.04" - architectures: [amd64] - - build-on: - - name: ubuntu - channel: "22.04" - architectures: [s390x] - run-on: - - name: ubuntu - 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] + - CHARM_INTERFACES_DIR: /root/project/interfaces/ + - CHARM_LAYERS_DIR: /root/project/layers/ + - MAKEFLAGS: -j$(nproc) + +base: ubuntu@24.04 +platforms: + amd64: + build-on: amd64 + build-for: amd64 + arm64: + build-on: arm64 + build-for: arm64 + ppc64el: + build-on: ppc64el + build-for: ppc64el + s390x: + build-on: s390x + build-for: s390x diff --git a/osci.yaml b/osci.yaml index f8e4cdb..cc11f55 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: ovn-central build_type: charmcraft - charmcraft_channel: 2.2/stable + charmcraft_channel: 3.x/beta diff --git a/requirements.txt b/requirements.txt index b3dc23f..c5b8af3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ # 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 -setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 # NOTE: newer versions of cryptography require a Rust compiler to build, # see diff --git a/src/config.yaml b/src/config.yaml index 87bb7a1..812ee00 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -1,6 +1,6 @@ options: source: - default: zed + default: caracal type: string description: | Repository from which to install packages. diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/noble-caracal.yaml similarity index 68% rename from src/tests/bundles/jammy-caracal.yaml rename to src/tests/bundles/noble-caracal.yaml index ad6af15..c87248a 100644 --- a/src/tests/bundles/jammy-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -1,9 +1,9 @@ variables: - openstack-origin: &openstack-origin cloud:jammy-caracal + openstack-origin: &openstack-origin caracal local_overlay_enabled: False -series: jammy +series: noble applications: @@ -13,7 +13,7 @@ applications: channel: latest/edge ovn-central: - charm: ../../../ovn-central_ubuntu-22.04-amd64.charm + charm: ../../../ovn-central_amd64.charm num_units: 3 options: source: *openstack-origin diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 0767a71..4690f2d 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,15 +1,13 @@ charm_name: ovn-central gate_bundles: -- jammy-caracal +- noble-caracal smoke_bundles: -- jammy-caracal +- noble-caracal dev_bundles: -- jammy-bobcat -- jammy-caracal -- mantic-bobcat +- noble-caracal target_deploy_status: ovn-central: @@ -32,6 +30,3 @@ tests: - zaza.openstack.charm_tests.ovn.tests.CentralCharmOperationTest - zaza.openstack.charm_tests.ovn.tests.OVNCentralDownscaleTests -tests_options: - force_deploy: - - mantic-bobcat diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 97ca0d1..dd0cfcd 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -3,8 +3,7 @@ psutil poetry-core six -# pin zipp to a version that does not require setuptools>=42 -zipp<=1.2.0 +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 diff --git a/test-requirements.txt b/test-requirements.txt index a7936e6..3fd5feb 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. -setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 stestr>=2.2.0