Update templates for Atomic (sub)variant renames

Atomic was renamed AtomicHost, and Workstation Ostree was renamed
AtomicWorkstation, for F28+. As we still have F26 and F27 images
which will have the Atomic name, we duplicate those templates,
but there should be no more 'Workstation Ostree' images, so we
just rename those templates to the new name.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-03-06 16:03:28 -08:00
parent 544cd2fb73
commit 08b4c6984c

View File

@ -199,7 +199,29 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicHost-dvd_ostree-iso",
version => "*",
},
test_suite => { name => "install_default" },
},
{
machine => { name => "uefi" },
prio => 51,
product => {
arch => "x86_64",
distri => "fedora",
flavor => "AtomicHost-dvd_ostree-iso",
version => "*",
},
test_suite => { name => "install_default" },
},
{
machine => { name => "64bit" },
prio => 50,
product => {
arch => "x86_64",
distri => "fedora",
flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "install_default_upload" }, test_suite => { name => "install_default_upload" },
@ -210,7 +232,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "install_default" }, test_suite => { name => "install_default" },
@ -243,7 +265,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "install_no_user" }, test_suite => { name => "install_no_user" },
@ -287,7 +309,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_selinux" }, test_suite => { name => "base_selinux" },
@ -331,7 +353,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_services_start" }, test_suite => { name => "base_services_start" },
@ -386,7 +408,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_service_manipulation" }, test_suite => { name => "base_service_manipulation" },
@ -463,7 +485,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_system_logging" }, test_suite => { name => "base_system_logging" },
@ -518,7 +540,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "desktop_terminal" }, test_suite => { name => "desktop_terminal" },
@ -551,7 +573,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
version => "*", version => "*",
}, },
test_suite => { name => "desktop_browser" }, test_suite => { name => "desktop_browser" },
@ -1834,6 +1856,30 @@
}, },
test_suite => { name => "install_default_upload" }, test_suite => { name => "install_default_upload" },
}, },
{
group_name => "Fedora PowerPC",
machine => { name => "ppc64le" },
prio => 10,
product => {
arch => "ppc64le",
distri => "fedora",
flavor => "AtomicHost-dvd_ostree-iso",
version => "*",
},
test_suite => { name => "install_default" },
},
{
group_name => "Fedora PowerPC",
machine => { name => "ppc64le" },
prio => 10,
product => {
arch => "ppc64le",
distri => "fedora",
flavor => "AtomicHost-dvd_ostree-iso",
version => "*",
},
test_suite => { name => "install_default_upload" },
},
{ {
group_name => "Fedora PowerPC", group_name => "Fedora PowerPC",
machine => { name => "ppc64le" }, machine => { name => "ppc64le" },
@ -3409,6 +3455,18 @@
], ],
version => "*", version => "*",
}, },
{
arch => "x86_64",
distri => "fedora",
flavor => "AtomicHost-dvd_ostree-iso",
name => "",
settings => [
{ key => "CANNED", value => "1" },
{ key => "PACKAGE_SET", value => "default" },
{ key => "TEST_TARGET", value => "ISO" }
],
version => "*",
},
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
@ -3538,7 +3596,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "Workstation Ostree-dvd_ostree-iso", flavor => "AtomicWorkstation-dvd_ostree-iso",
name => "", name => "",
settings => [ settings => [
{ key => "CANNED", value => "1" }, { key => "CANNED", value => "1" },
@ -3590,6 +3648,18 @@
], ],
version => "*", version => "*",
}, },
{
arch => "ppc64le",
distri => "fedora",
flavor => "AtomicHost-dvd_ostree-iso",
name => "",
settings => [
{ key => "CANNED", value => "1" },
{ key => "PACKAGE_SET", value => "default" },
{ key => "TEST_TARGET", value => "ISO" }
],
version => "*",
},
{ {
arch => "ppc64", arch => "ppc64",
distri => "fedora", distri => "fedora",