From 29eb92752b8cccae37fb87a1a85ca767a59fe774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sedl=C3=A1k?= Date: Wed, 25 Nov 2015 12:37:55 +0100 Subject: [PATCH] change MACHINE variables to have more compatible VMs, remove 32bit machine As we saw with F23 testing, qemu32 isn't really supported CPU. Also, we cannot be sure that `std` is really supported graphics. This changes MACHINE variables to use `host` CPU with 64bit machines (moreover, this is the case in BOS now). It also deletes 32bit machine and schedules 32bit tests on 64bit instead. It also changes graphics to `qxl`. Even though we aren't using SPICE, qxl has better support (and higher priority) and it seems to work OK with VNC. Fixes T637. Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D655 --- templates | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/templates b/templates index bdca968f..7a455071 100755 --- a/templates +++ b/templates @@ -447,7 +447,7 @@ test_suite => { name => "european_language_install" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -457,7 +457,7 @@ test_suite => { name => "default_install" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -467,7 +467,7 @@ test_suite => { name => "default_install" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -477,7 +477,7 @@ test_suite => { name => "default_install" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -487,7 +487,7 @@ test_suite => { name => "default_install" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -497,7 +497,7 @@ test_suite => { name => "default_install" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -507,7 +507,7 @@ test_suite => { name => "package_set_minimal" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -517,7 +517,7 @@ test_suite => { name => "server_repository_http_graphical" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -527,7 +527,7 @@ test_suite => { name => "server_scsi_updates_img" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -537,7 +537,7 @@ test_suite => { name => "server_simple_encrypted" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -547,7 +547,7 @@ test_suite => { name => "server_software_raid" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -557,7 +557,7 @@ test_suite => { name => "server_btrfs" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -567,7 +567,7 @@ test_suite => { name => "server_ext3" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -577,7 +577,7 @@ test_suite => { name => "server_lvmthin" }, }, { - machine => { name => "32bit" }, + machine => { name => "64bit" }, product => { arch => "i386", distri => "fedora", @@ -592,21 +592,9 @@ backend => "qemu", name => "64bit", settings => [ - { key => "QEMUCPU", value => "qemu64" }, + { key => "QEMUCPU", value => "host" }, { key => "QEMUCPUS", value => "2"}, - { key => "QEMUVGA", value => "std"}, - { key => "QEMURAM", value => "2048"}, - { key => "PART_TABLE_TYPE", value => "mbr"} - ], - variables => "", - }, - { - backend => "qemu", - name => "32bit", - settings => [ - { key => "QEMUCPU", value => "qemu32" }, - { key => "QEMUCPUS", value => "2"}, - { key => "QEMUVGA", value => "std"}, + { key => "QEMUVGA", value => "qxl"}, { key => "QEMURAM", value => "2048"}, { key => "PART_TABLE_TYPE", value => "mbr"} ], @@ -616,9 +604,9 @@ backend => "qemu", name => "uefi", settings => [ - { key => "QEMUCPU", value => "qemu64" }, + { key => "QEMUCPU", value => "host" }, { key => "QEMUCPUS", value => "2"}, - { key => "QEMUVGA", value => "std"}, + { key => "QEMUVGA", value => "qxl"}, { key => "QEMURAM", value => "2048"}, { key => "UEFI", value => "1"}, { key => "PART_TABLE_TYPE", value => "gpt"}