diff --git a/.zuul.yaml b/.zuul.yaml index fd20909..1a5e9a7 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: designate diff --git a/charmcraft.yaml b/charmcraft.yaml index 953004e..4d59dd9 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -19,36 +19,18 @@ parts: build-environment: - CHARM_INTERFACES_DIR: $CRAFT_PROJECT_DIR/interfaces/ - CHARM_LAYERS_DIR: $CRAFT_PROJECT_DIR/layers/ -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] + +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 a1e883a..fe516f0 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: designate build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable diff --git a/src/config.yaml b/src/config.yaml index ca91144..02d0b0e 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -155,4 +155,4 @@ options: description: | Set the project ID to own all managed resources like auto-created records etc. openstack-origin: - default: bobcat + default: caracal diff --git a/src/metadata.yaml b/src/metadata.yaml index c128416..ef54c05 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,8 +12,6 @@ docs: https://discourse.charmhub.io/t/designate-docs-index/11220 tags: - openstack - dns -series: - - jammy subordinate: false provides: dnsaas: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index 1c43b79..0000000 --- a/src/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,139 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope - -local_overlay_enabled: False - -series: jammy - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - series: focal - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - designate-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - channel: 2024.1/edge - - designate-bind: - charm: ch:designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - channel: 2024.1/edge - - memcached: - charm: ch:memcached - num_units: 1 - # Note that holding memcached at focal as it's not available at jammy yet. - series: focal - to: - - '7' - - designate: - charm: ../../../designate_ubuntu-22.04-amd64.charm - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: ch:nrpe - channel: latest/edge - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-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' - - - - 'designate:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index 419d8b3..0000000 --- a/src/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,139 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat - -local_overlay_enabled: False - -series: jammy - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - series: focal - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - designate-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - channel: 2024.1/edge - - designate-bind: - charm: ch:designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - channel: 2024.1/edge - - memcached: - charm: ch:memcached - num_units: 1 - # Note that holding memcached at focal as it's not available at jammy yet. - series: focal - to: - - '7' - - designate: - charm: ../../../designate_ubuntu-22.04-amd64.charm - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: ch:nrpe - channel: latest/edge - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-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' - - - - 'designate:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/jammy-caracal.yaml b/src/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index 3026c4f..0000000 --- a/src/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,139 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:jammy-caracal - -local_overlay_enabled: False - -series: jammy - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - series: focal - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - designate-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '3' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: 2024.1/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - openstack-origin: *openstack-origin - to: - - '5' - channel: 2024.1/edge - - designate-bind: - charm: ch:designate-bind - num_units: 1 - # NOTE(ajkavanagh) apparently it has no openstack origin! - #options: - #openstack-origin: *openstack-origin - to: - - '6' - channel: 2024.1/edge - - memcached: - charm: ch:memcached - num_units: 1 - # Note that holding memcached at focal as it's not available at jammy yet. - series: focal - to: - - '7' - - designate: - charm: ../../../designate_ubuntu-22.04-amd64.charm - num_units: 1 - options: - nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' - openstack-origin: *openstack-origin - to: - - '8' - - nrpe: - charm: ch:nrpe - channel: latest/edge - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:shared-db' - - 'designate-mysql-router:shared-db' - - - 'designate-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'designate:amqp' - - 'rabbitmq-server:amqp' - - - - 'designate:identity-service' - - 'keystone:identity-service' - - - - 'designate:dns-backend' - - 'designate-bind:dns-backend' - - - - 'designate:coordinator-memcached' - - 'memcached:cache' - - - - 'designate:dnsaas' - - 'neutron-api:external-dns' - - - - 'neutron-api:identity-service' - - 'keystone:identity-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' - - - - 'designate:nrpe-external-master' - - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/noble-caracal.yaml b/src/tests/bundles/noble-caracal.yaml index fe60e8f..3ab0fba 100644 --- a/src/tests/bundles/noble-caracal.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -17,7 +17,8 @@ machines: '5': '6': '7': - series: focal + # Note: memcached is only available on jammy + series: jammy '8': applications: @@ -55,7 +56,7 @@ applications: openstack-origin: *openstack-origin to: - '4' - channel: 2024.1/edge + channel: latest/edge neutron-api: charm: ch:neutron-api @@ -65,7 +66,7 @@ applications: openstack-origin: *openstack-origin to: - '5' - channel: 2024.1/edge + channel: latest/edge designate-bind: charm: ch:designate-bind @@ -75,18 +76,17 @@ applications: #openstack-origin: *openstack-origin to: - '6' - channel: 2024.1/edge + channel: latest/edge memcached: charm: ch:memcached num_units: 1 - # Note that holding memcached at focal as it's not available at jammy yet. - series: focal + series: jammy to: - '7' designate: - charm: ../../../designate_ubuntu-22.04-amd64.charm + charm: ../../../designate_amd64.charm num_units: 1 options: nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 2710c52..9392312 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,11 +1,9 @@ charm_name: designate smoke_bundles: - - jammy-caracal + - noble-caracal gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal dev_bundles: - noble-caracal tests: 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/tox.ini b/tox.ini index 80a50ed..c0b6324 100644 --- a/tox.ini +++ b/tox.ini @@ -60,21 +60,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: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} [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} @@ -89,7 +89,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 =