From e65eaf3151dc842f635a1f87f55523aa3996d7af Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 9 Feb 2024 18:15:47 +0000 Subject: [PATCH] Updates for caracal testing support These updates, on the master branch, are to support testing the caracal packages and support of the charms for caracal. They do NOT lock the charms down, and don't change the testing branches to stable branches. Change-Id: If2944411e04d21448f518b701f74a35ae39cd20e --- charmcraft.yaml | 6 ---- charmhelpers/contrib/openstack/context.py | 3 +- charmhelpers/contrib/openstack/utils.py | 25 ++++------------ charmhelpers/fetch/ubuntu.py | 10 +++++++ metadata.yaml | 10 +++---- tests/bundles/jammy-antelope.yaml | 12 ++++---- tests/bundles/jammy-bobcat.yaml | 12 ++++---- ...{mantic-bobcat.yaml => jammy-caracal.yaml} | 16 +++++----- ...lunar-antelope.yaml => noble-caracal.yaml} | 14 ++++----- tests/tests.yaml | 30 ++++++++----------- 10 files changed, 61 insertions(+), 77 deletions(-) rename tests/bundles/{mantic-bobcat.yaml => jammy-caracal.yaml} (93%) rename tests/bundles/{lunar-antelope.yaml => noble-caracal.yaml} (95%) diff --git a/charmcraft.yaml b/charmcraft.yaml index 62a8f5b8..09f03428 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 42f15032..1e667fb0 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 e98be2c5..da711c65 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] @@ -585,7 +575,6 @@ def get_installed_os_version(): return openstack_release().get('OPENSTACK_CODENAME') -@cached def openstack_release(): """Return /etc/os-release in a dict.""" d = {} @@ -847,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 1be992c4..d0089eb7 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 5234aeb1..aa71adb1 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -8,13 +8,11 @@ description: | service, to Nova's compute nodes. docs: https://discourse.charmhub.io/t/glance-docs-index/10553 tags: -- openstack -- storage -- misc + - openstack + - storage + - 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 97700521..c8bcb84d 100644 --- a/tests/bundles/jammy-antelope.yaml +++ b/tests/bundles/jammy-antelope.yaml @@ -62,7 +62,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: reef/edge ceph-radosgw: charm: ch:ceph-radosgw @@ -71,7 +71,7 @@ applications: source: *openstack-origin to: - '15' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -83,7 +83,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: reef/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -100,7 +100,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge glance: expose: True @@ -127,7 +127,7 @@ applications: block-device: None to: - '16' - channel: latest/edge + channel: 2024.1/edge cinder-lvm: charm: ch:cinder-lvm @@ -138,7 +138,7 @@ applications: ephemeral-unmount: /mnt allocation-type: auto config-flags: target_helper=lioadm - channel: latest/edge + channel: 2024.1/edge relations: - - 'keystone:shared-db' diff --git a/tests/bundles/jammy-bobcat.yaml b/tests/bundles/jammy-bobcat.yaml index 49d29fa3..c1d937a4 100644 --- a/tests/bundles/jammy-bobcat.yaml +++ b/tests/bundles/jammy-bobcat.yaml @@ -62,7 +62,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: reef/edge ceph-radosgw: charm: ch:ceph-radosgw @@ -71,7 +71,7 @@ applications: source: *openstack-origin to: - '15' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -83,7 +83,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: reef/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -100,7 +100,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge glance: expose: True @@ -127,7 +127,7 @@ applications: block-device: None to: - '16' - channel: latest/edge + channel: 2024.1/edge cinder-lvm: charm: ch:cinder-lvm @@ -138,7 +138,7 @@ applications: ephemeral-unmount: /mnt allocation-type: auto config-flags: target_helper=lioadm - channel: latest/edge + channel: 2024.1/edge relations: - - 'keystone:shared-db' diff --git a/tests/bundles/mantic-bobcat.yaml b/tests/bundles/jammy-caracal.yaml similarity index 93% rename from tests/bundles/mantic-bobcat.yaml rename to tests/bundles/jammy-caracal.yaml index 01a4d20b..570f8a0f 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' @@ -62,7 +62,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: reef/edge ceph-radosgw: charm: ch:ceph-radosgw @@ -71,7 +71,7 @@ applications: source: *openstack-origin to: - '15' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -83,7 +83,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: reef/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -100,7 +100,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge glance: expose: True @@ -127,7 +127,7 @@ applications: block-device: None to: - '16' - channel: latest/edge + channel: 2024.1/edge cinder-lvm: charm: ch:cinder-lvm @@ -138,7 +138,7 @@ applications: ephemeral-unmount: /mnt allocation-type: auto config-flags: target_helper=lioadm - channel: latest/edge + channel: 2024.1/edge relations: - - 'keystone:shared-db' diff --git a/tests/bundles/lunar-antelope.yaml b/tests/bundles/noble-caracal.yaml similarity index 95% rename from tests/bundles/lunar-antelope.yaml rename to tests/bundles/noble-caracal.yaml index dda2379c..75498661 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' @@ -62,7 +62,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: reef/edge ceph-radosgw: charm: ch:ceph-radosgw @@ -71,7 +71,7 @@ applications: source: *openstack-origin to: - '15' - channel: latest/edge + channel: reef/edge ceph-mon: charm: ch:ceph-mon @@ -83,7 +83,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: reef/edge rabbitmq-server: charm: ch:rabbitmq-server @@ -100,7 +100,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2024.1/edge glance: expose: True @@ -127,7 +127,7 @@ applications: block-device: None to: - '16' - channel: latest/edge + channel: 2024.1/edge cinder-lvm: charm: ch:cinder-lvm @@ -138,7 +138,7 @@ applications: ephemeral-unmount: /mnt allocation-type: auto config-flags: target_helper=lioadm - channel: latest/edge + channel: 2024.1/edge relations: - - 'keystone:shared-db' diff --git a/tests/tests.yaml b/tests/tests.yaml index 4ebcece9..163abe24 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,25 +4,22 @@ comment: - 'the glance configure job validates operation of identity-service relation' smoke_bundles: - - jammy-antelope - + - jammy-caracal gate_bundles: - jammy-antelope - -dev_bundles: - jammy-bobcat - - lunar-antelope - - mantic-bobcat - + - jammy-caracal +dev_bundles: + - noble-caracal configure: - zaza.openstack.charm_tests.glance.setup.add_lts_image - zaza.openstack.charm_tests.glance.setup.configure_external_s3_backend - zaza.openstack.charm_tests.keystone.setup.add_demo_user - full_run: - - zaza.openstack.charm_tests.glance.setup.add_cirros_image - - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image - - zaza.openstack.charm_tests.keystone.setup.add_demo_user - - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles + - zaza.openstack.charm_tests.glance.setup.add_cirros_image + - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image + - zaza.openstack.charm_tests.keystone.setup.add_demo_user + - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles tests: - zaza.openstack.charm_tests.glance.tests.GlanceTest @@ -33,16 +30,15 @@ tests: - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation - full_run: - - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3 - - zaza.openstack.charm_tests.glance.tests.GlanceTest - - zaza.openstack.charm_tests.policyd.tests.GlanceTests + - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3 + - zaza.openstack.charm_tests.glance.tests.GlanceTest + - zaza.openstack.charm_tests.policyd.tests.GlanceTests tests_options: tempest: full_run: - smoke: True + smoke: true policyd: service: glance force_deploy: - - lunar-antelope - - mantic-bobcat + - noble-caracal