Merge "Make patrole-member job run for queens and pike branches"
This commit is contained in:
commit
1f2ba24f4d
19
.zuul.yaml
19
.zuul.yaml
|
@ -55,10 +55,25 @@
|
||||||
name: patrole-member
|
name: patrole-member
|
||||||
parent: patrole-base
|
parent: patrole-base
|
||||||
description: Patrole job for Member role.
|
description: Patrole job for Member role.
|
||||||
|
# This currently works from stable/pike onward.
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
- stable/queens
|
||||||
|
- stable/pike
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
RBAC_TEST_ROLE: Member
|
RBAC_TEST_ROLE: Member
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: patrole-member-queens
|
||||||
|
parent: patrole-member
|
||||||
|
override-checkout: stable/queens
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: patrole-member-pike
|
||||||
|
parent: patrole-member
|
||||||
|
override-checkout: stable/pike
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: patrole-multinode-admin
|
name: patrole-multinode-admin
|
||||||
parent: patrole-base-multinode
|
parent: patrole-base-multinode
|
||||||
|
@ -98,6 +113,8 @@
|
||||||
jobs:
|
jobs:
|
||||||
- patrole-admin
|
- patrole-admin
|
||||||
- patrole-member
|
- patrole-member
|
||||||
|
- patrole-member-queens
|
||||||
|
- patrole-member-pike
|
||||||
- patrole-py35-member
|
- patrole-py35-member
|
||||||
- patrole-multinode-admin
|
- patrole-multinode-admin
|
||||||
- patrole-multinode-member
|
- patrole-multinode-member
|
||||||
|
@ -106,5 +123,7 @@
|
||||||
jobs:
|
jobs:
|
||||||
- patrole-admin
|
- patrole-admin
|
||||||
- patrole-member
|
- patrole-member
|
||||||
|
- patrole-member-queens
|
||||||
|
- patrole-member-pike
|
||||||
- patrole-py35-member
|
- patrole-py35-member
|
||||||
- openstack-tox-lower-constraints
|
- openstack-tox-lower-constraints
|
||||||
|
|
|
@ -13,15 +13,24 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from tempest import config
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
|
|
||||||
from patrole_tempest_plugin import rbac_rule_validation
|
from patrole_tempest_plugin import rbac_rule_validation
|
||||||
from patrole_tempest_plugin.tests.api.identity import rbac_base
|
from patrole_tempest_plugin.tests.api.identity import rbac_base
|
||||||
|
|
||||||
|
CONF = config.CONF
|
||||||
|
|
||||||
|
|
||||||
class ProjectTagsV3RbacTest(rbac_base.BaseIdentityV3RbacTest):
|
class ProjectTagsV3RbacTest(rbac_base.BaseIdentityV3RbacTest):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def skip_checks(cls):
|
||||||
|
super(ProjectTagsV3RbacTest, cls).skip_checks()
|
||||||
|
if not CONF.identity_feature_enabled.project_tags:
|
||||||
|
raise cls.skipException("Project tags feature disabled")
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def resource_setup(cls):
|
def resource_setup(cls):
|
||||||
super(ProjectTagsV3RbacTest, cls).resource_setup()
|
super(ProjectTagsV3RbacTest, cls).resource_setup()
|
||||||
|
|
Loading…
Reference in New Issue