split install_default into upload/no-upload variants

Summary:
this should avoid unnecessary disk uploads and hopefully help
further reduce the incidence of weird failures in the chained
tests.

With this change we should only upload disk images for the cases
where we're actually going to run the chained tests: we won't
upload disk images for default_install runs on images we don't
run the chained tests for, or for the UEFI job for images we
*do* run the chained tests for.

We only actually need to run the current chained tests
for Server DVD, Workstation live and KDE live x86_64; there's
no need to run them for Everything boot, so we drop that.

Test Plan:
Do a full test run and make sure all tests run
properly and we now only upload disk images where we really need
to.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D794
This commit is contained in:
Adam Williamson 2016-03-24 13:38:32 -07:00
parent 3e435182dd
commit 10783f7280

View File

@ -15,7 +15,7 @@
flavor => "Workstation-live-iso", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "install_default" }, test_suite => { name => "install_default_upload" },
}, },
{ {
machine => { name => "uefi" }, machine => { name => "uefi" },
@ -59,7 +59,7 @@
flavor => "Server-dvd-iso", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "install_default" }, test_suite => { name => "install_default_upload" },
}, },
{ {
machine => { name => "uefi" }, machine => { name => "uefi" },
@ -125,7 +125,7 @@
flavor => "KDE-live-iso", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "install_default" }, test_suite => { name => "install_default_upload" },
}, },
{ {
machine => { name => "uefi" }, machine => { name => "uefi" },
@ -149,17 +149,6 @@
}, },
test_suite => { name => "install_default" }, test_suite => { name => "install_default" },
}, },
{
machine => { name => "64bit" },
prio => 40,
product => {
arch => "x86_64",
distri => "fedora",
flavor => "Everything-boot-iso",
version => "*",
},
test_suite => { name => "base_selinux" },
},
{ {
machine => { name => "64bit" }, machine => { name => "64bit" },
prio => 40, prio => 40,
@ -193,17 +182,6 @@
}, },
test_suite => { name => "base_selinux" }, test_suite => { name => "base_selinux" },
}, },
{
machine => { name => "64bit" },
prio => 40,
product => {
arch => "x86_64",
distri => "fedora",
flavor => "Everything-boot-iso",
version => "*",
},
test_suite => { name => "base_services_start" },
},
{ {
machine => { name => "64bit" }, machine => { name => "64bit" },
prio => 40, prio => 40,
@ -237,17 +215,6 @@
}, },
test_suite => { name => "base_services_start" }, test_suite => { name => "base_services_start" },
}, },
{
machine => { name => "64bit" },
prio => 40,
product => {
arch => "x86_64",
distri => "fedora",
flavor => "Everything-boot-iso",
version => "*",
},
test_suite => { name => "base_service_manipulation" },
},
{ {
machine => { name => "64bit" }, machine => { name => "64bit" },
prio => 40, prio => 40,
@ -1107,6 +1074,12 @@
TestSuites => [ TestSuites => [
{ {
name => "install_default", name => "install_default",
settings => [
{ key => "PACKAGE_SET", value => "default" },
],
},
{
name => "install_default_upload",
settings => [ settings => [
{ key => "PACKAGE_SET", value => "default" }, { key => "PACKAGE_SET", value => "default" },
{ key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" }, { key => "STORE_HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
@ -1360,7 +1333,7 @@
name => "base_selinux", name => "base_selinux",
settings => [ settings => [
{ key => "ENTRYPOINT", value => "base_selinux" }, { key => "ENTRYPOINT", value => "base_selinux" },
{ key => "START_AFTER_TEST", value => "install_default" }, { key => "START_AFTER_TEST", value => "install_default_upload" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" }, { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
], ],
@ -1369,7 +1342,7 @@
name => "base_services_start", name => "base_services_start",
settings => [ settings => [
{ key => "ENTRYPOINT", value => "base_services_start" }, { key => "ENTRYPOINT", value => "base_services_start" },
{ key => "START_AFTER_TEST", value => "install_default" }, { key => "START_AFTER_TEST", value => "install_default_upload" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" }, { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
], ],
@ -1378,7 +1351,7 @@
name => "base_service_manipulation", name => "base_service_manipulation",
settings => [ settings => [
{ key => "ENTRYPOINT", value => "base_service_manipulation" }, { key => "ENTRYPOINT", value => "base_service_manipulation" },
{ key => "START_AFTER_TEST", value => "install_default" }, { key => "START_AFTER_TEST", value => "install_default_upload" },
{ key => "BOOTFROM", value => "c" }, { key => "BOOTFROM", value => "c" },
{ key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" }, { key => "HDD_1", value => "disk_%FLAVOR%_%MACHINE%.qcow2" },
], ],