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: Id88fe1d5e3b177099966c659d11b96e6d1fb4c4f

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]

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

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:
+    try:
-        codename = get_os_codename_install_source(src)
+        avail_vers = get_os_version_install_source(src)
-        avail_vers = get_os_version_codename_swift(codename)
+    except Exception:
-    else:
+        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
 

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'),
 ])
 
 

metadata.yaml

@@ -5,12 +5,10 @@ description: |
   The OpenStack Dashboard provides a full feature web interface for interacting
   with instances, images, volumes and networks within an OpenStack deployment.
 tags:
-- openstack
+  - openstack
-- misc
+  - misc
 series:
-- jammy
+  - jammy
-- lunar
-- mantic
 extra-bindings:
   public:  # Only used to allow specifying a hostname for DNS-HA.
 provides:

tests/bundles/jammy-antelope.yaml

@@ -46,7 +46,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ../../openstack-dashboard.charm

tests/bundles/jammy-bobcat.yaml

@@ -46,7 +46,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ../../openstack-dashboard.charm

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'
@@ -46,7 +46,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ../../openstack-dashboard.charm

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'
@@ -46,7 +46,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: latest/edge
+    channel: 2024.1/edge
 
   openstack-dashboard:
     charm: ../../openstack-dashboard.charm

tests/tests.yaml

@@ -4,39 +4,33 @@ comment:
   - ''
 
 smoke_bundles:
-  - jammy-antelope
+  - jammy-caracal
-
 gate_bundles:
   - jammy-antelope
-
-dev_bundles:
   - jammy-bobcat
-  - lunar-antelope
+  - jammy-caracal
-  - mantic-bobcat
+dev_bundles:
-  - jammy-antelope-gr:
+  - noble-caracal
-    - vault: jammy-vault
-    - dashboard: jammy-antelope-cmr-vault
-
 configure:
   - vault:
-    - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation_no_wait
+      - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation_no_wait
   - dashboard:
-    - zaza.openstack.charm_tests.keystone.setup.wait_for_cacert
+      - zaza.openstack.charm_tests.keystone.setup.wait_for_cacert
-    - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+      - zaza.openstack.charm_tests.keystone.setup.add_demo_user
   - checklist-work-required:
-    - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+      - zaza.openstack.charm_tests.keystone.setup.add_demo_user
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 
 tests:
   - vault:
-    - zaza.charm_tests.noop.tests.NoopTest
+      - zaza.charm_tests.noop.tests.NoopTest
   - dashboard:
-    - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardTests
+      - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardTests
-    - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardPolicydTests
+      - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardPolicydTests
-    - zaza.openstack.charm_tests.openstack_dashboard.tests.SecurityTests
+      - zaza.openstack.charm_tests.openstack_dashboard.tests.SecurityTests
   - checklist-work-required:
-    - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardTests
+      - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardTests
-    - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardPolicydTests
+      - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardPolicydTests
   - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardTests
   - zaza.openstack.charm_tests.openstack_dashboard.tests.OpenStackDashboardPolicydTests
   - zaza.openstack.charm_tests.openstack_dashboard.tests.SecurityTests
@@ -45,9 +39,7 @@ tests_options:
   policyd:
     service: openstack-dashboard
   force_deploy:
-    - lunar-antelope
+    - noble-caracal
-    - mantic-bobcat
-
 target_deploy_status:
   vault:
     workload-status: blocked