disable murano scenario test in queens-py35 job

Persistent instability in the test on queens branch and only in the
py35 job (py27 seems fine).
The instability makes the test more trouble than it's worth.
Because we are unlikely to make changes to queens going forward,
and even less likely that the changes would break murano integration,
it makes sense to simply disable to test for queens-py35 job, but
keeping it in all other jobs including queens-py27.

Also folding in the following patch resolving gate instability because
both patches are blocked on its own.
---------------------------------------
Increase policy rule create retry limit

Because in the vitrage pub-sub tests, occassionally the retry runs
out before the schema from the datasource is available to the
policy engine to allow the creation of the test rule.

https://review.openstack.org/#/c/637681/

Change-Id: I4915023258b455005e1ac2e2d1492beb368f0184
This commit is contained in:
Eric K 2019-02-19 11:13:40 -08:00 committed by Eric Kao
parent 7ceee1c6f5
commit 2b4c0ba868
2 changed files with 3 additions and 2 deletions

View File

@ -293,7 +293,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
return helper.retry_check_function_return_value_condition(
lambda: self._create_policy_rule(
policy_name, rule, rule_name, comment),
lambda v: True, retry_attempts=20, retry_interval=2)
lambda v: True, retry_attempts=50, retry_interval=2)
class DatasourceDriverTestBase(ScenarioPolicyBase):

View File

@ -40,7 +40,8 @@
# enable_plugin aodh git://git.openstack.org/openstack/aodh
enable_plugin heat git://git.openstack.org/openstack/heat
enable_plugin congress git://git.openstack.org/openstack/congress
enable_plugin murano git://git.openstack.org/openstack/murano
# disable murano on queens-py35 because of test instability
# enable_plugin murano git://git.openstack.org/openstack/murano
enable_plugin neutron https://git.openstack.org/openstack/neutron
# To deploy congress as multi-process (api, pe, datasources)
CONGRESS_MULTIPROCESS_DEPLOYMENT=True