diff --git a/cfme/fixtures/templates.py b/cfme/fixtures/templates.py index e055a56f31..2d16625ae8 100644 --- a/cfme/fixtures/templates.py +++ b/cfme/fixtures/templates.py @@ -18,6 +18,7 @@ class Templates(NamedConstant): RHEL69_TEMPLATE = "rhel69_template" RHEL7_MINIMAL = "rhel7_minimal" RHEL7_MINIMAL_MODSCOPE = "rhel7_minimal_modscope" + RHEL8_TEMPLATE = "rhel81_template" UBUNTU16_TEMPLATE = "ubuntu16_template" WIN7_TEMPLATE = "win7_template" WIN10_TEMPLATE = "win10_template" @@ -157,6 +158,16 @@ def rhel74_template_modscope(provider): return _get_template(provider, 'rhel74_template') +@pytest.fixture(scope="function") +def rhel81_template(provider): + return _get_template(provider, 'rhel81_template') + + +@pytest.fixture(scope="module") +def rhel81_template_modscope(provider): + return _get_template(provider, 'rhel81_template') + + @pytest.fixture(scope="function") def win7_template(provider): return _get_template(provider, 'win7_template') diff --git a/cfme/tests/v2v/test_v2v_migrations.py b/cfme/tests/v2v/test_v2v_migrations.py index f45fc379a8..7a40e40c63 100644 --- a/cfme/tests/v2v/test_v2v_migrations.py +++ b/cfme/tests/v2v/test_v2v_migrations.py @@ -286,9 +286,11 @@ def _cleanup(): ["nfs", "nfs", [Templates.RHEL69_TEMPLATE]], ["nfs", "nfs", [Templates.WIN2012_TEMPLATE]], ["nfs", "nfs", [Templates.UBUNTU16_TEMPLATE]], + ["nfs", "nfs", [Templates.RHEL8_TEMPLATE]], ], ids=[Templates.WIN7_TEMPLATE, Templates.WIN10_TEMPLATE, Templates.WIN2016_TEMPLATE, - Templates.RHEL69_TEMPLATE, Templates.WIN2012_TEMPLATE, Templates.UBUNTU16_TEMPLATE] + Templates.RHEL69_TEMPLATE, Templates.WIN2012_TEMPLATE, Templates.UBUNTU16_TEMPLATE, + Templates.RHEL8_TEMPLATE] ) def test_migrations_different_os_templates(request, appliance, provider, source_type, dest_type, template_type,