diff --git a/cfme/cloud/instance/__init__.py b/cfme/cloud/instance/__init__.py index 5744ab123d..fe429e6c0f 100644 --- a/cfme/cloud/instance/__init__.py +++ b/cfme/cloud/instance/__init__.py @@ -341,7 +341,8 @@ def vm_default_args(self): }, 'properties': { 'instance_type': partial_match(provisioning.get('instance_type')), - 'guest_keypair': provisioning.get('guest_keypair') + 'guest_keypair': provisioning.get('guest_keypair'), + 'is_preemptible': provisioning.get('is_preemptible') } } diff --git a/cfme/tests/cloud_infra_common/test_provisioning.py b/cfme/tests/cloud_infra_common/test_provisioning.py index 5d6a4f3bd6..3676db86e9 100644 --- a/cfme/tests/cloud_infra_common/test_provisioning.py +++ b/cfme/tests/cloud_infra_common/test_provisioning.py @@ -105,6 +105,8 @@ def test_provision_from_template(provider, provisioned_instance): @pytest.mark.provider([GCEProvider], required_fields=[['provisioning', 'image']]) @pytest.mark.usefixtures('setup_provider') +@pytest.mark.meta(blockers=[GH('ManageIQ/integration_tests:7661')]) +@pytest.mark.meta(blockers=[BZ(1619298, forced_streams=['5.9', '5.10'])]) def test_gce_preemptible_provision(appliance, provider, instance_args, soft_assert): """ Polarion: @@ -114,7 +116,7 @@ def test_gce_preemptible_provision(appliance, provider, instance_args, soft_asse initialEstimate: 1/6h """ vm_name, inst_args = instance_args - inst_args['properties']['is_preemptible'] = True + inst_args.setdefault('properties', {})['is_preemptible'] = True instance = appliance.collections.cloud_instances.create(vm_name, provider, form_values=inst_args)