diff --git a/.zuul.yaml b/.zuul.yaml index fd20909..ed03e34 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,3 +2,9 @@ templates: - openstack-python3-charm-jobs - openstack-cover-jobs + + check: + jobs: + - charmbuild + vars: + charm_build_name: cinder-solidfire diff --git a/charmcraft.yaml b/charmcraft.yaml index 652ab74..7217725 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -19,13 +19,17 @@ parts: apt install -y ca-certificates update-ca-certificates -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/metadata.yaml b/metadata.yaml index fde1064..2887bd4 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -9,8 +9,6 @@ tags: - storage - file-servers - misc -series: - - jammy subordinate: true provides: storage-backend: diff --git a/osci.yaml b/osci.yaml index c4d4d96..b3f988a 100644 --- a/osci.yaml +++ b/osci.yaml @@ -7,4 +7,4 @@ needs_charm_build: true charm_build_name: cinder-solidfire build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable 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/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index 423481a..0000000 --- a/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,76 +0,0 @@ -series: jammy -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope -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': - constraints: mem=4G root-disk=16G - -applications: - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - rabbitmq-server: - charm: ch:rabbitmq-server - channel: latest/edge - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - keystone: - charm: ch:keystone - channel: 2024.1/edge - options: - openstack-origin: *openstack-origin - num_units: 1 - to: - - '4' - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder: - charm: ch:cinder - channel: 2024.1/edge - num_units: 1 - storage: - block-devices: '40G' - options: - openstack-origin: *openstack-origin - block-device: None - overwrite: "true" - to: - - '5' - - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - cinder-solidfire: - charm: ../../cinder-solidfire.charm - -relations: - - [ keystone:shared-db, keystone-mysql-router:shared-db ] - - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ] - - [ cinder:shared-db, cinder-mysql-router:shared-db ] - - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ] - - [ cinder:identity-service, keystone:identity-service ] - - [ cinder:amqp, rabbitmq-server:amqp ] - - [ cinder:storage-backend, cinder-solidfire:storage-backend ] diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index e605439..0000000 --- a/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,76 +0,0 @@ -series: jammy -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat -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': - constraints: mem=4G root-disk=16G - -applications: - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - rabbitmq-server: - charm: ch:rabbitmq-server - channel: latest/edge - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - keystone: - charm: ch:keystone - channel: 2024.1/edge - options: - openstack-origin: *openstack-origin - num_units: 1 - to: - - '4' - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder: - charm: ch:cinder - channel: 2024.1/edge - num_units: 1 - storage: - block-devices: '40G' - options: - openstack-origin: *openstack-origin - block-device: None - overwrite: "true" - to: - - '5' - - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - cinder-solidfire: - charm: ../../cinder-solidfire.charm - -relations: - - [ keystone:shared-db, keystone-mysql-router:shared-db ] - - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ] - - [ cinder:shared-db, cinder-mysql-router:shared-db ] - - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ] - - [ cinder:identity-service, keystone:identity-service ] - - [ cinder:amqp, rabbitmq-server:amqp ] - - [ cinder:storage-backend, cinder-solidfire:storage-backend ] diff --git a/tests/bundles/jammy-caracal.yaml b/tests/bundles/jammy-caracal.yaml deleted file mode 100644 index 12f9f4c..0000000 --- a/tests/bundles/jammy-caracal.yaml +++ /dev/null @@ -1,76 +0,0 @@ -series: jammy -variables: - openstack-origin: &openstack-origin cloud:jammy-caracal -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': - constraints: mem=4G root-disk=16G - -applications: - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - channel: latest/edge - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - rabbitmq-server: - charm: ch:rabbitmq-server - channel: latest/edge - num_units: 1 - options: - source: *openstack-origin - to: - - '3' - keystone: - charm: ch:keystone - channel: 2024.1/edge - options: - openstack-origin: *openstack-origin - num_units: 1 - to: - - '4' - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder: - charm: ch:cinder - channel: 2024.1/edge - num_units: 1 - storage: - block-devices: '40G' - options: - openstack-origin: *openstack-origin - block-device: None - overwrite: "true" - to: - - '5' - - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - cinder-solidfire: - charm: ../../cinder-solidfire.charm - -relations: - - [ keystone:shared-db, keystone-mysql-router:shared-db ] - - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ] - - [ cinder:shared-db, cinder-mysql-router:shared-db ] - - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ] - - [ cinder:identity-service, keystone:identity-service ] - - [ cinder:amqp, rabbitmq-server:amqp ] - - [ cinder:storage-backend, cinder-solidfire:storage-backend ] diff --git a/tests/bundles/noble-caracal.yaml b/tests/bundles/noble-caracal.yaml index e237890..63672c8 100644 --- a/tests/bundles/noble-caracal.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -37,7 +37,7 @@ applications: - '3' keystone: charm: ch:keystone - channel: 2024.1/edge + channel: latest/edge options: openstack-origin: *openstack-origin num_units: 1 @@ -48,7 +48,7 @@ applications: channel: latest/edge cinder: charm: ch:cinder - channel: 2024.1/edge + channel: latest/edge num_units: 1 storage: block-devices: '40G' diff --git a/tests/tests.yaml b/tests/tests.yaml index f60c55a..fb71d33 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,13 +4,11 @@ tests: configure: - zaza.openstack.charm_tests.keystone.setup.add_demo_user gate_bundles: - - jammy-antelope - - jammy-bobcat - - jammy-caracal + - noble-caracal dev_bundles: - noble-caracal smoke_bundles: - - jammy-caracal + - noble-caracal tests_options: force_deploy: - noble-caracal diff --git a/tox.ini b/tox.ini index 3e44bd9..a677e84 100644 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,7 @@ setenv = VIRTUAL_ENV={envdir} CHARM_LAYERS_DIR={toxinidir}/layers CHARM_INTERFACES_DIR={toxinidir}/interfaces JUJU_REPOSITORY={toxinidir}/build + TEST_JUJU3=1 # Note(mylesjp): Force Juju 3 passenv = no_proxy http_proxy @@ -62,20 +63,27 @@ 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-noble.txt} + -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + [testenv:pep8] basepython = python3 -deps = flake8==3.9.2 +deps = flake8==7.1.1 git+https://github.com/juju/charm-tools.git commands = flake8 {posargs} src unit_tests @@ -84,7 +92,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 =