Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

[1LP][RFR] Replace the fixed blocker for BZ 1783355 with BZ 1888748 #10340

Merged
merged 2 commits into from
Nov 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cfme/tests/infrastructure/test_iso_provisioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
from cfme.markers.env_markers.provider import SECOND
from cfme.provisioning import do_vm_provisioning
from cfme.utils.appliance.implementations.ui import navigate_to
from cfme.utils.blockers import BZ
from cfme.utils.conf import cfme_data
from cfme.utils.version import Version

pytestmark = [
pytest.mark.meta(server_roles="+automate"),
Expand Down Expand Up @@ -70,6 +72,8 @@ def vm_name():
return vm_name


@pytest.mark.meta(blockers=[BZ(1888748, forced_streams=["5.11", "5.10"],
unblock=lambda provider: provider.version != Version("4.4"))])
@pytest.mark.tier(2)
@test_requirements.provision
def test_iso_provision_from_template(appliance, provider, vm_name, datastore_init, request):
Expand Down
2 changes: 1 addition & 1 deletion cfme/tests/services/test_iso_service_catalogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def catalog_item(appliance, provider, dialog, catalog, provisioning):


@test_requirements.rhev
@pytest.mark.meta(blockers=[BZ(1783355, forced_streams=["5.11", "5.10"],
@pytest.mark.meta(blockers=[BZ(1888748, forced_streams=["5.11", "5.10"],
unblock=lambda provider: provider.version != Version("4.4"))])
def test_rhev_iso_servicecatalog(appliance, provider, setup_provider, setup_iso_datastore,
catalog_item, request):
Expand Down