Merge "Fix router leak from L3AgentsExtRbacTest class"
diff --git a/.zuul.yaml b/.zuul.yaml
index f9d972e..270300c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -117,15 +117,6 @@
TEMPEST_PLUGINS: /opt/stack/patrole
- job:
- name: patrole-member-pike
- nodeset: openstack-single-node-xenial
- parent: patrole-member
- override-checkout: stable/pike
- vars:
- devstack_localrc:
- TEMPEST_PLUGINS: /opt/stack/patrole
-
-- job:
name: patrole-multinode-admin
parent: patrole-base-multinode
voting: false
@@ -220,7 +211,6 @@
- patrole-member-stein
- patrole-member-rocky
- patrole-member-queens
- - patrole-member-pike
- patrole-multinode-admin
- patrole-multinode-member
- patrole-extension-admin
@@ -234,4 +224,3 @@
- patrole-member-stein
- patrole-member-rocky
- patrole-member-queens
- - patrole-member-pike
diff --git a/patrole_tempest_plugin/tests/api/network/test_flavor_service_profile_rbac.py b/patrole_tempest_plugin/tests/api/network/test_flavor_service_profile_rbac.py
index 0ada6ac..bcc7670 100644
--- a/patrole_tempest_plugin/tests/api/network/test_flavor_service_profile_rbac.py
+++ b/patrole_tempest_plugin/tests/api/network/test_flavor_service_profile_rbac.py
@@ -61,6 +61,7 @@
self.create_flavor_service_profile(self.flavor_id,
self.service_profile_id)
+ @decorators.skip_because(bug='1843290', bug_type='launchpad')
@decorators.idempotent_id('3b680d9e-946a-4670-ab7f-0e4576675833')
@rbac_rule_validation.action(service="neutron",
rules=["delete_flavor_service_profile"])