Merge pull request #1214 from wolsen/backport-designate-agent-changes

Remove designate-agent for caracal+ testing
openstack-charmers · May 31, 2024 · 9358922 · 9358922
2 parents 4b61fb7 + 680a09a
commit 9358922
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/zaza/openstack/charm_tests/designate/tests.py b/zaza/openstack/charm_tests/designate/tests.py
@@ -44,8 +44,15 @@ def setUpClass(cls, application_name=None, model_alias=None):
         model_alias = model_alias or ""
         super(BaseDesignateTest, cls).setUpClass(application_name, model_alias)
         os_release = openstack_utils.get_os_release
+        current_release = os_release()
 
-        if os_release() >= os_release('bionic_rocky'):
+        if current_release >= os_release('jammy_caracal'):
+            cls.designate_svcs = [
+                'designate-api', 'designate-central',
+                'designate-mdns', 'designate-worker', 'designate-sink',
+                'designate-producer',
+            ]
+        elif current_release >= os_release('bionic_rocky'):
             cls.designate_svcs = [
                 'designate-agent', 'designate-api', 'designate-central',
                 'designate-mdns', 'designate-worker', 'designate-sink',