From 1fc8bd4ea8467aea1059f301d8618c2da4622ed6 Mon Sep 17 00:00:00 2001 From: Myles Penner Date: Fri, 30 Aug 2024 16:50:00 +0000 Subject: [PATCH] Add charmcraft 3 support Summary of changes: - Update the charmcraft.yaml file to use base and platforms, only allowing noble support. - Update config to default to caracal. - Update osci.yaml to use the charmcraft 3.x/beta - Drop non-noble tests - Update constraints file from -2024.1.txt to -noble.txt - Add charmbuild to .zuul.yaml Change-Id: Iec7c08d7cad826276020e300b0335eaa46dc1fc8 --- .zuul.yaml | 5 ++ charmcraft.yaml | 26 +++--- osci.yaml | 2 +- src/metadata.yaml | 2 - src/tests/bundles/jammy-antelope.yaml | 112 -------------------------- src/tests/bundles/jammy-bobcat.yaml | 112 -------------------------- src/tests/bundles/jammy-caracal.yaml | 112 -------------------------- src/tests/bundles/noble-caracal.yaml | 4 +- src/tests/tests.yaml | 6 +- src/tox.ini | 2 +- test-requirements.txt | 2 +- tox.ini | 8 +- 12 files changed, 31 insertions(+), 362 deletions(-) delete mode 100644 src/tests/bundles/jammy-antelope.yaml delete mode 100644 src/tests/bundles/jammy-bobcat.yaml delete mode 100644 src/tests/bundles/jammy-caracal.yaml diff --git a/.zuul.yaml b/.zuul.yaml index fd20909..a40f4cf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,3 +2,8 @@ templates: - openstack-python3-charm-jobs - openstack-cover-jobs + check: + jobs: + - charmbuild + vars: + charm_build_name: barbican-vault diff --git a/charmcraft.yaml b/charmcraft.yaml index c31dea1..c31545a 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -7,18 +7,22 @@ parts: build-packages: - libpython3-dev build-snaps: - - charm + - charm/latest/edge build-environment: - CHARM_INTERFACES_DIR: /root/project/interfaces/ - CHARM_LAYERS_DIR: /root/project/layers/ -bases: - - build-on: - - name: ubuntu - channel: "22.04" - architectures: - - amd64 - run-on: - - name: ubuntu - channel: "22.04" - architectures: [amd64, s390x, ppc64el, arm64] +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 2c5b5e2..85ead1c 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: barbican-vault build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable diff --git a/src/metadata.yaml b/src/metadata.yaml index c48b221..3ccd973 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -4,8 +4,6 @@ maintainer: OpenStack Charmers description: Vault backend for OpenStack Barbican tags: - openstack -series: - - jammy subordinate: true provides: secrets: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index bb1dcf0..0000000 --- a/src/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,112 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope - -local_overlay_enabled: False - -series: jammy - -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': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-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 - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - channel: 2024.1/edge - - barbican: - charm: ch:barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - channel: 2024.1/edge - - barbican-vault: - charm: ../../../barbican-vault.charm - num_units: 0 - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '7' - channel: latest/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '8' - channel: latest/edge - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index 8725f06..0000000 --- a/src/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,112 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat - -local_overlay_enabled: False - -series: jammy - -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': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-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 - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - channel: 2024.1/edge - - barbican: - charm: ch:barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - channel: 2024.1/edge - - barbican-vault: - charm: ../../../barbican-vault.charm - num_units: 0 - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '7' - channel: latest/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '8' - channel: latest/edge - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index d6ea2f8..0000000 --- a/src/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,112 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-caracal - -local_overlay_enabled: False - -series: jammy - -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': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-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 - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - channel: 2024.1/edge - - barbican: - charm: ch:barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - channel: 2024.1/edge - - barbican-vault: - charm: ../../../barbican-vault.charm - num_units: 0 - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '7' - channel: latest/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '8' - channel: latest/edge - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml index a8f6422..4a71f60 100644 --- a/src/tests/bundles/noble-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -51,7 +51,7 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: 2024.1/edge + channel: latest/edge barbican: charm: ch:barbican @@ -62,7 +62,7 @@ applications: - '4' - '5' - '6' - channel: 2024.1/edge + channel: latest/edge barbican-vault: charm: ../../../barbican-vault.charm diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index b2142ce..d5d7e2f 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,10 +1,8 @@ charm_name: barbican-vault smoke_bundles: - - jammy-caracal + - noble-caracal gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal dev_bundles: - noble-caracal target_deploy_status: diff --git a/src/tox.ini b/src/tox.ini index 2ddcccd..3ce5e85 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -26,7 +26,7 @@ passenv = OS_* TEST_* deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt [testenv:pep8] diff --git a/test-requirements.txt b/test-requirements.txt index 3fd5feb..910e6a4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,7 @@ # 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 stestr>=2.2.0 # Dependency of stestr. Workaround for diff --git a/tox.ini b/tox.ini index c2178fb..1727bfa 100644 --- a/tox.ini +++ b/tox.ini @@ -62,21 +62,21 @@ commands = [testenv:py3] basepython = python3 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:py310] basepython = python3.10 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:py312] basepython = python3.12 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} @@ -91,7 +91,7 @@ commands = flake8 {posargs} src unit_tests # https://github.com/openstack/nova/blob/master/tox.ini basepython = python3 deps = - -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-noble.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt setenv =