diff --git a/.zuul.yaml b/.zuul.yaml index 0eed196..ad1e12a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,3 +2,9 @@ templates: - openstack-python3-ussuri-jobs - openstack-cover-jobs + + check: + jobs: + - charmbuild + vars: + charm_build_name: cinder-three-par diff --git a/charmcraft.yaml b/charmcraft.yaml index 9a9ac47..7217725 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -19,19 +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] - - name: ubuntu - channel: "23.04" - architectures: [amd64, s390x, ppc64el, arm64] - - name: ubuntu - channel: "23.10" - 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 4722ba8..0524095 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,4 +6,4 @@ needs_charm_build: true charm_build_name: cinder-three-par build_type: charmcraft - charmcraft_channel: 2.x/stable + charmcraft_channel: 3.x/stable diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml deleted file mode 100644 index 00b3669..0000000 --- a/tests/bundles/jammy-antelope.yaml +++ /dev/null @@ -1,35 +0,0 @@ -series: jammy -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope -machines: - '0': -local_overlay_enabled: false -relations: - - - cinder:storage-backend - - cinder-three-par:storage-backend -applications: - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - overwrite: "true" - ephemeral-unmount: /mnt - to: - - '0' - cinder-three-par: - charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm - options: - hpe3par-debug: False - driver-type: fc - san-ip: 127.0.0.1 - san-login: admin - san-password: password - hpe3par-username: admin - hpe3par-password: password - hpe3par-api-url: https://127.0.0.1:8080/api/v1/ - hpe3par-cpg: cpgname - hpe3par_cpg_snap: cpgname - use-multipath-for-image-xfer: True - enforce-multipath-for-image-xfer: True diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml deleted file mode 100644 index b948768..0000000 --- a/tests/bundles/jammy-bobcat.yaml +++ /dev/null @@ -1,35 +0,0 @@ -series: jammy -variables: - openstack-origin: &openstack-origin cloud:jammy-bobcat -machines: - '0': -local_overlay_enabled: false -relations: - - - cinder:storage-backend - - cinder-three-par:storage-backend -applications: - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - overwrite: "true" - ephemeral-unmount: /mnt - to: - - '0' - cinder-three-par: - charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm - options: - hpe3par-debug: False - driver-type: fc - san-ip: 127.0.0.1 - san-login: admin - san-password: password - hpe3par-username: admin - hpe3par-password: password - hpe3par-api-url: https://127.0.0.1:8080/api/v1/ - hpe3par-cpg: cpgname - hpe3par_cpg_snap: cpgname - use-multipath-for-image-xfer: True - enforce-multipath-for-image-xfer: True diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/mantic-bobcat.yaml deleted file mode 100644 index 29c9084..0000000 --- a/tests/bundles/mantic-bobcat.yaml +++ /dev/null @@ -1,35 +0,0 @@ -series: mantic -variables: - openstack-origin: &openstack-origin distro -machines: - '0': -local_overlay_enabled: false -relations: - - - cinder:storage-backend - - cinder-three-par:storage-backend -applications: - cinder: - charm: ch:cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: None - overwrite: "true" - ephemeral-unmount: /mnt - to: - - '0' - cinder-three-par: - charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm - options: - hpe3par-debug: False - driver-type: fc - san-ip: 127.0.0.1 - san-login: admin - san-password: password - hpe3par-username: admin - hpe3par-password: password - hpe3par-api-url: https://127.0.0.1:8080/api/v1/ - hpe3par-cpg: cpgname - hpe3par_cpg_snap: cpgname - use-multipath-for-image-xfer: True - enforce-multipath-for-image-xfer: True diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/noble-caracal.yaml similarity index 81% rename from tests/bundles/lunar-antelope.yaml rename to tests/bundles/noble-caracal.yaml index d7b269b..94ce344 100644 --- a/tests/bundles/lunar-antelope.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -1,6 +1,6 @@ -series: lunar +series: caracal variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:noble-caracal machines: '0': local_overlay_enabled: false @@ -19,7 +19,7 @@ applications: to: - '0' cinder-three-par: - charm: ../../../cinder-three-par_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64_ubuntu-23.10-amd64.charm + charm: ../../../cinder-three-par.charm options: hpe3par-debug: False driver-type: fc diff --git a/tests/tests.yaml b/tests/tests.yaml index 1dbca0e..524a2f3 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,15 +1,13 @@ charm_name: cinder-three-par smoke_bundles: -- jammy-antelope +- noble-caracal gate_bundles: -- jammy-antelope +- noble-caracal dev_bundles: -- jammy-bobcat -- lunar-antelope -- mantic-bobcat +- noble-caracal target_deploy_status: cinder: @@ -23,5 +21,4 @@ tests: tests_options: force_deploy: - - lunar-antelope - - mantic-bobcat + - noble-carcal diff --git a/tox.ini b/tox.ini index c11375e..34c582d 100644 --- a/tox.ini +++ b/tox.ini @@ -69,9 +69,14 @@ basepython = python3.10 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} +[testenv:py312] +basepython = python3.12 +deps = -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