Merge "Remove python3.9 support"
diff --git a/.zuul.yaml b/.zuul.yaml
index f89f874..eab10ad 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,8 @@
- job:
- name: designate-bind9-stable-2024-1
+ name: designate-bind9-stable-2025-1
parent: designate-bind9
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2024.1
+ nodeset: openstack-single-node-noble
+ override-checkout: stable/2025.1
- job:
name: designate-bind9-stable-2024-2
@@ -11,10 +11,10 @@
override-checkout: stable/2024.2
- job:
- name: designate-bind9-stable-2023-2
+ name: designate-bind9-stable-2024-1
parent: designate-bind9
nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.2
+ override-checkout: stable/2024.1
- job:
name: designate-bind9-multipool
@@ -43,8 +43,8 @@
- release-notes-jobs-python3
check:
jobs:
+ - designate-bind9-stable-2025-1
- designate-bind9-stable-2024-2
- designate-bind9-stable-2024-1
- - designate-bind9-stable-2023-2
- designate-bind9-multipool
- neutron-tempest-plugin-designate-scenario
diff --git a/designate_tempest_plugin/config.py b/designate_tempest_plugin/config.py
index 2a8e25e..90548da 100644
--- a/designate_tempest_plugin/config.py
+++ b/designate_tempest_plugin/config.py
@@ -77,14 +77,10 @@
default=False,
help="Is project IDs verified when setting v2 quotas. "
"Must be set to True starting from Rocky release."),
- cfg.BoolOpt('bug_1573141_fixed',
+ cfg.BoolOpt('bug_1932026_fixed',
default=True,
deprecated_for_removal=True,
- deprecated_reason='This bug was fixed in 3.0.0',
- help="Is https://bugs.launchpad.net/designate/+bug/1573141 "
- "fixed"),
- cfg.BoolOpt('bug_1932026_fixed',
- default=False,
+ deprecated_reason='Bug 1932026 was fixed in designate 14.0.0',
help="Is https://bugs.launchpad.net/designate/+bug/1932026 "
"fixed"),
cfg.StrOpt('designate_manage_path',
diff --git a/designate_tempest_plugin/data_utils.py b/designate_tempest_plugin/data_utils.py
index 75a7d41..31989b7 100644
--- a/designate_tempest_plugin/data_utils.py
+++ b/designate_tempest_plugin/data_utils.py
@@ -92,15 +92,10 @@
zone_recordsets or data_utils.rand_int_id(100, 999999),
'recordset_records':
recordset_records or data_utils.rand_int_id(100, 999999),
+ 'api_export_size':
+ api_export_size or data_utils.rand_int_id(100, 999999)
}
- if CONF.dns_feature_enabled.bug_1573141_fixed:
- quotas_dict['api_export_size'] = (
- api_export_size or data_utils.rand_int_id(100, 999999))
- else:
- LOG.warning("Leaving `api_export_size` out of quota data due to: "
- "https://bugs.launchpad.net/designate/+bug/1573141")
-
return quotas_dict
diff --git a/designate_tempest_plugin/tests/api/admin/test_quotas.py b/designate_tempest_plugin/tests/api/admin/test_quotas.py
index da76894..9043e77 100644
--- a/designate_tempest_plugin/tests/api/admin/test_quotas.py
+++ b/designate_tempest_plugin/tests/api/admin/test_quotas.py
@@ -24,11 +24,9 @@
class BaseQuotasTest(base.BaseDnsAdminTest):
- excluded_keys = []
+ excluded_keys = ['api_export_size']
def setUp(self):
- if CONF.dns_feature_enabled.bug_1573141_fixed:
- self.excluded_keys = ['api_export_size']
super(BaseQuotasTest, self).setUp()
diff --git a/releasenotes/notes/deprecate-bug_1932026_fixed-bce77fd318bdac52.yaml b/releasenotes/notes/deprecate-bug_1932026_fixed-bce77fd318bdac52.yaml
new file mode 100644
index 0000000..eb3a7d5
--- /dev/null
+++ b/releasenotes/notes/deprecate-bug_1932026_fixed-bce77fd318bdac52.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+ - |
+ The ``[dns_feature_enabled] bug_1932026_fixed`` option has been deprecated.
+ Its default value has been changed from ``False`` to ``True``.
diff --git a/releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml b/releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml
new file mode 100644
index 0000000..6e0b87b
--- /dev/null
+++ b/releasenotes/notes/remove-bug_1573141_fixed-0d485186ade21df3.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ The ``[dns_feature_enabled] bug_1573141_fixed`` option has been removed.