[RFR] Fix RHV44 iso service catalogs

cfme/tests/services/test_iso_service_catalogs.py

@@ -7,8 +7,11 @@
 from cfme.infrastructure.pxe import get_template_from_config
 from cfme.infrastructure.pxe import ISODatastore
 from cfme.services.service_catalogs import ServiceCatalogs
+from cfme.utils.blockers import BZ
 from cfme.utils.generators import random_vm_name
 from cfme.utils.log import logger
+from cfme.utils.version import Version
+
 
 pytestmark = [
     pytest.mark.meta(server_roles="+automate"),
@@ -94,6 +97,8 @@ def catalog_item(appliance, provider, dialog, catalog, provisioning):
 
 
 @test_requirements.rhev
+@pytest.mark.meta(blockers=[BZ(1783355, 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):
     """Tests RHEV ISO service catalog

conf/supportability.yaml

@@ -10,6 +10,7 @@
         - 4.1
         - 4.2
         - 4.3
+        - 4.4
       - scvmm:
         - 2012
         - 2016

conf/supportability.yaml.template

@@ -65,6 +65,8 @@
       - rhevm:
         - 4.1
         - 4.2
+        - 4.3
+        - 4.4
       - scvmm:
         - 2012
         - 2016

data/rhel8.cfg

@@ -0,0 +1,81 @@
+<%
+  # Account for some missing values
+  evm[:root_password]  = root_fallback_password if evm[:root_password].blank?
+  evm[:hostname]       = evm[:vm_target_hostname] if evm[:hostname].blank?
+  evm[:addr_mode]      = ['dhcp'] if evm[:ip_addr].blank? || evm[:subnet_mask].blank? || evm[:gateway].blank?
+
+  rhn_activation_key = ""
+
+  # Dynamically create the network string based on values from the dialog
+  if evm[:addr_mode].first == 'static'
+    network_string = "network --onboot yes --bootproto=static --noipv6"
+    ["ip", :ip_addr, "netmask", :subnet_mask, "gateway", :gateway, "hostname", :hostname, "nameserver", :dns_servers].each_slice(2) do |ks_key, evm_key|
+      network_string << " --#{ks_key} #{evm[evm_key]}" unless evm[evm_key].blank?
+    end
+  else
+    network_string = "network --onboot yes --bootproto=dhcp --noipv6"
+    network_string << " --#{"hostname"} #{evm[:hostname]}" unless evm[:hostname].blank?
+  end
+%>
+# Install OS instead of upgrade
+install
+# Firewall configuration
+firewall --enabled --ssh --service=ssh
+# Use network installation
+url --url="$url1"
+# Network information
+network  --bootproto=dhcp --device=eth0
+# Root password
+rootpw  --iscrypted <%=MiqPassword.md5crypt(evm[:root_password]) %>
+# System authorization information
+auth  --useshadow  --passalgo=sha512
+# Use text mode install
+text
+# System keyboard
+keyboard us
+# System language
+lang en_US
+# SELinux configuration
+selinux --enforcing
+# Do not configure the X Window System
+skipx
+# Installation logging level
+logging --level=info
+# Power Off after installation - Needed to complete EVM provisioning
+shutdown
+# System timezone
+timezone  America/New_York
+# System bootloader configuration
+# Clear the Master Boot Record
+zerombr
+# Partition clearing information
+clearpart --all --initlabel
+# Disk partitioning information
+autopart --fstype=ext4
+bootloader --location=mbr --append="rhgb quiet"
+
+repo --name=rhel-x86_64-server-8 --baseurl=$url1
+repo --name=rhel-x86_64-server-optional-7 --baseurl=$url2
+
+%packages
+@base
+@core
+xorg-x11-xauth
+nfs-utils
+autofs
+qemu-guest-agent
+wget
+%end
+
+%post --log=/root/kickstart-post.log
+set -x
+
+dhclient
+
+systemctl enable ovirt-guest-agent.service
+systemctl start ovirt-guest-agent.service
+
+
+#Callback to CFME during post-install
+wget --no-check-certificate <%=evm[:post_install_callback_url] %>
+%end