diff --git a/build-requirements.txt b/build-requirements.txt deleted file mode 100644 index b6d2452..0000000 --- a/build-requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -# NOTES(lourot): -# * We don't install charmcraft via pip anymore because it anyway spins up a -# container and scp the system's charmcraft snap inside it. So the charmcraft -# snap is necessary on the system anyway. -# * `tox -e build` successfully validated with charmcraft 1.2.1 - -cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/charmcraft.yaml b/charmcraft.yaml index 62a8f5b..09f0342 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -31,9 +31,3 @@ bases: - 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] diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py index 42f1503..1e667fb 100644 --- a/charmhelpers/contrib/openstack/context.py +++ b/charmhelpers/contrib/openstack/context.py @@ -545,7 +545,7 @@ class IdentityServiceContext(OSContextGenerator): 'internal_auth_url': internal_auth_url, }) - # we keep all veriables in ctxt for compatibility and + # we keep all variables in ctxt for compatibility and # add nested dictionary for keystone_authtoken generic # templating if keystonemiddleware_os_release: @@ -557,6 +557,7 @@ class IdentityServiceContext(OSContextGenerator): # NOTE(jamespage) this is required for >= icehouse # so a missing value just indicates keystone needs # upgrading + ctxt['admin_user_id'] = _resolve('service_user_id') ctxt['admin_tenant_id'] = _resolve('service_tenant_id') ctxt['admin_domain_id'] = _resolve('service_domain_id') return ctxt diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index ee49224..da711c6 100644 --- a/charmhelpers/contrib/openstack/utils.py +++ b/charmhelpers/contrib/openstack/utils.py @@ -161,6 +161,7 @@ OPENSTACK_CODENAMES = OrderedDict([ ('2022.2', 'zed'), ('2023.1', 'antelope'), ('2023.2', 'bobcat'), + ('2024.1', 'caracal'), ]) # The ugly duckling - must list releases oldest to newest @@ -416,17 +417,6 @@ def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES, error_out(e) -def get_os_version_codename_swift(codename): - '''Determine OpenStack version number of swift from codename.''' - # for k, v in six.iteritems(SWIFT_CODENAMES): - for k, v in SWIFT_CODENAMES.items(): - if k == codename: - return v[-1] - e = 'Could not derive swift version for '\ - 'codename: %s' % codename - error_out(e) - - def get_swift_codename(version): '''Determine OpenStack codename that corresponds to swift version.''' codenames = [k for k, v in SWIFT_CODENAMES.items() if version in v] @@ -846,14 +836,10 @@ def openstack_upgrade_available(package): if not cur_vers: # The package has not been installed yet do not attempt upgrade return False - if "swift" in package: - codename = get_os_codename_install_source(src) - avail_vers = get_os_version_codename_swift(codename) - else: - try: - avail_vers = get_os_version_install_source(src) - except Exception: - avail_vers = cur_vers + try: + avail_vers = get_os_version_install_source(src) + except Exception: + avail_vers = cur_vers apt.init() return apt.version_compare(avail_vers, cur_vers) >= 1 diff --git a/charmhelpers/fetch/ubuntu.py b/charmhelpers/fetch/ubuntu.py index 1be992c..d0089eb 100644 --- a/charmhelpers/fetch/ubuntu.py +++ b/charmhelpers/fetch/ubuntu.py @@ -246,6 +246,14 @@ CLOUD_ARCHIVE_POCKETS = { 'bobcat/proposed': 'jammy-proposed/bobcat', 'jammy-bobcat/proposed': 'jammy-proposed/bobcat', 'jammy-proposed/bobcat': 'jammy-proposed/bobcat', + # caracal + 'caracal': 'jammy-updates/caracal', + 'jammy-caracal': 'jammy-updates/caracal', + 'jammy-caracal/updates': 'jammy-updates/caracal', + 'jammy-updates/caracal': 'jammy-updates/caracal', + 'caracal/proposed': 'jammy-proposed/caracal', + 'jammy-caracal/proposed': 'jammy-proposed/caracal', + 'jammy-proposed/caracal': 'jammy-proposed/caracal', # OVN 'focal-ovn-22.03': 'focal-updates/ovn-22.03', @@ -279,6 +287,7 @@ OPENSTACK_RELEASES = ( 'zed', 'antelope', 'bobcat', + 'caracal', ) @@ -308,6 +317,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([ ('kinetic', 'zed'), ('lunar', 'antelope'), ('mantic', 'bobcat'), + ('noble', 'caracal'), ]) diff --git a/metadata.yaml b/metadata.yaml index 0a905bf..ff76c45 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -10,13 +10,11 @@ description: | of consumers. docs: https://discourse.charmhub.io/t/ceilometer-docs-index/11219 tags: -- openstack -- telemetry -- misc + - openstack + - telemetry + - misc series: -- jammy -- lunar -- mantic + - jammy extra-bindings: public: admin: diff --git a/tests/bundles/jammy-antelope.yaml b/tests/bundles/jammy-antelope.yaml index b802b86..8925063 100644 --- a/tests/bundles/jammy-antelope.yaml +++ b/tests/bundles/jammy-antelope.yaml @@ -85,7 +85,7 @@ applications: - '5' - '6' - '7' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -96,7 +96,7 @@ applications: - '8' - '9' - '10' - channel: latest/edge + channel: reef/edge keystone: charm: ch:keystone @@ -105,7 +105,7 @@ applications: openstack-origin: *openstack-origin to: - '11' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -114,7 +114,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -123,7 +123,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -132,7 +132,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2024.1/edge ceilometer: charm: ../../ceilometer.charm @@ -158,11 +158,11 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2024.1/edge ceilometer-agent: charm: ch:ceilometer-agent - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml index f93e105..5be4bc0 100644 --- a/tests/bundles/jammy-bobcat.yaml +++ b/tests/bundles/jammy-bobcat.yaml @@ -85,7 +85,7 @@ applications: - '5' - '6' - '7' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -96,7 +96,7 @@ applications: - '8' - '9' - '10' - channel: latest/edge + channel: reef/edge keystone: charm: ch:keystone @@ -105,7 +105,7 @@ applications: openstack-origin: *openstack-origin to: - '11' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -114,7 +114,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -123,7 +123,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -132,7 +132,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -141,7 +141,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2024.1/edge ceilometer: charm: ../../ceilometer.charm @@ -158,11 +158,11 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2024.1/edge ceilometer-agent: charm: ch:ceilometer-agent - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/jammy-caracal.yaml similarity index 92% rename from tests/bundles/mantic-bobcat.yaml rename to tests/bundles/jammy-caracal.yaml index 9ba88df..6700376 100644 --- a/tests/bundles/mantic-bobcat.yaml +++ b/tests/bundles/jammy-caracal.yaml @@ -1,7 +1,7 @@ variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:jammy-caracal -series: mantic +series: jammy comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -14,6 +14,7 @@ machines: constraints: mem=3072M '3': '4': + # Note that holding memcached at focal as it's not available at jammy yet. series: focal '5': '6': @@ -68,7 +69,7 @@ applications: memcached: charm: ch:memcached num_units: 1 - # Note that holding memcached at focal as it's not available at mantic yet. + # Note that holding memcached at focal as it's not available at jammy yet. series: focal to: - '4' @@ -84,7 +85,7 @@ applications: - '5' - '6' - '7' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -95,7 +96,7 @@ applications: - '8' - '9' - '10' - channel: latest/edge + channel: reef/edge keystone: charm: ch:keystone @@ -104,7 +105,7 @@ applications: openstack-origin: *openstack-origin to: - '11' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -113,7 +114,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -122,7 +123,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -131,7 +132,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -140,7 +141,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2024.1/edge ceilometer: charm: ../../ceilometer.charm @@ -157,11 +158,11 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2024.1/edge ceilometer-agent: charm: ch:ceilometer-agent - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/noble-caracal.yaml similarity index 93% rename from tests/bundles/lunar-antelope.yaml rename to tests/bundles/noble-caracal.yaml index b47ec04..eb60c01 100644 --- a/tests/bundles/lunar-antelope.yaml +++ b/tests/bundles/noble-caracal.yaml @@ -1,7 +1,7 @@ variables: openstack-origin: &openstack-origin distro -series: lunar +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -14,6 +14,7 @@ machines: constraints: mem=3072M '3': '4': + # Note that holding memcached at focal as it's not available at jammy yet. series: focal '5': '6': @@ -68,7 +69,7 @@ applications: memcached: charm: ch:memcached num_units: 1 - # Note that holding memcached at focal as it's not available at lunar yet. + # Note that holding memcached at focal as it's not available at jammy yet. series: focal to: - '4' @@ -84,7 +85,7 @@ applications: - '5' - '6' - '7' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -95,7 +96,7 @@ applications: - '8' - '9' - '10' - channel: latest/edge + channel: reef/edge keystone: charm: ch:keystone @@ -104,7 +105,7 @@ applications: openstack-origin: *openstack-origin to: - '11' - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance @@ -113,7 +114,7 @@ applications: openstack-origin: *openstack-origin to: - '12' - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -122,7 +123,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -131,7 +132,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2024.1/edge nova-compute: charm: ch:nova-compute @@ -140,7 +141,7 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2024.1/edge ceilometer: charm: ../../ceilometer.charm @@ -157,11 +158,11 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2024.1/edge ceilometer-agent: charm: ch:ceilometer-agent - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/tests/tests.yaml b/tests/tests.yaml index 33cfc7a..d2ac371 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -5,15 +5,12 @@ configure: gate_bundles: - jammy-antelope - -dev_bundles: - jammy-bobcat - - lunar-antelope - - mantic-bobcat - + - jammy-caracal +dev_bundles: + - noble-caracal smoke_bundles: - - jammy-antelope - + - jammy-caracal tests: - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest @@ -24,5 +21,4 @@ target_deploy_status: tests_options: force_deploy: - - lunar-antelope - - mantic-bobcat + - noble-caracal diff --git a/tox.ini b/tox.ini index 2cb6ca1..57c2f4e 100644 --- a/tox.ini +++ b/tox.ini @@ -32,11 +32,13 @@ passenv = CS_* OS_* TEST_* -deps = -r{toxinidir}/test-requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements.txt [testenv:build] basepython = python3 -deps = -r{toxinidir}/build-requirements.txt +deps = # charmcraft clean is done to ensure that # `tox -e build` always performs a clean, repeatable build. # For faster rebuilds during development, @@ -49,12 +51,16 @@ commands = [testenv:py310] basepython = python3.10 -deps = -r{toxinidir}/requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt [testenv:py3] basepython = python3 -deps = -r{toxinidir}/requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt [testenv:pep8] @@ -68,7 +74,9 @@ commands = flake8 {posargs} hooks unit_tests tests actions lib files # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini basepython = python3 -deps = -r{toxinidir}/requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt setenv = {[testenv]setenv}