Merge "Extend tests for new Domain Manager Persona"
diff --git a/.zuul.yaml b/.zuul.yaml
index 8eaf6af..c1fc416 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,7 +10,6 @@
keystone: https://opendev.org/openstack/keystone
devstack_services:
g-api: false
- g-reg: false
n-api: false
n-api-meta: false
n-cond: false
@@ -45,9 +44,9 @@
- keystone-dsvm-py3-functional-federation-ubuntu-jammy:
voting: false
- keystone-dsvm-py3-functional-federation-ubuntu-jammy-k2k
+ - keystone-dsvm-py3-functional-2024-2
- keystone-dsvm-py3-functional-2024-1
- keystone-dsvm-py3-functional-2023-2
- - keystone-dsvm-py3-functional-2023-1
- keystone-protection-functional
gate:
jobs:
@@ -56,6 +55,12 @@
- keystone-protection-functional
- job:
+ name: keystone-dsvm-py3-functional-2024-2
+ parent: keystone-dsvm-py3-functional
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2024.2
+
+- job:
name: keystone-dsvm-py3-functional-2024-1
parent: keystone-dsvm-py3-functional
nodeset: openstack-single-node-jammy
@@ -66,9 +71,3 @@
parent: keystone-dsvm-py3-functional
nodeset: openstack-single-node-jammy
override-checkout: stable/2023.2
-
-- job:
- name: keystone-dsvm-py3-functional-2023-1
- parent: keystone-dsvm-py3-functional
- nodeset: openstack-single-node-jammy
- override-checkout: stable/2023.1
diff --git a/README.rst b/README.rst
index e02e663..7bf06be 100644
--- a/README.rst
+++ b/README.rst
@@ -13,4 +13,4 @@
* Free software: Apache license
* Documentation: https://docs.openstack.org/keystone/latest/
* Source: http://opendev.org/openstack/keystone-tempest-plugin
-* Bugs: http://bugs.launchpad.net/keystone_tempest_plugin
+* Bugs: https://bugs.launchpad.net/keystone/
diff --git a/keystone_tempest_plugin/tests/rbac/v3/test_policy_association.py b/keystone_tempest_plugin/tests/rbac/v3/test_policy_association.py
index c122eab..a23e4e4 100644
--- a/keystone_tempest_plugin/tests/rbac/v3/test_policy_association.py
+++ b/keystone_tempest_plugin/tests/rbac/v3/test_policy_association.py
@@ -157,7 +157,7 @@
This test must check
* whether the persona can delete a policy association for a region
and service
- """
+ """ # noqa: E501
pass
diff --git a/keystone_tempest_plugin/tests/scenario/keycloak.py b/keystone_tempest_plugin/tests/scenario/keycloak.py
index 50c3495..ef2b01d 100644
--- a/keystone_tempest_plugin/tests/scenario/keycloak.py
+++ b/keystone_tempest_plugin/tests/scenario/keycloak.py
@@ -26,7 +26,7 @@
@property
def url_base(self):
- return self.keycloak_url + f'/admin/realms'
+ return self.keycloak_url + '/admin/realms'
@property
def token_endpoint(self):
diff --git a/requirements.txt b/requirements.txt
index 67f303d..24faa8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
+# Requirements lower bounds listed here are our best effort to keep them up to
+# date but we do not test them so no guarantee of having them all correct. If
+# you find any incorrect lower bounds, let us know or propose a fix.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 566d844..cd35c3c 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
- import multiprocessing # noqa
-except ImportError:
- pass
-
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 9c7d865..3d2e1c5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-hacking>=3.0,<3.1.0;python_version>='3.5' # Apache-2.0
+hacking>=6.1.0,<6.2.0 # Apache-2.0