From 08b4c6984c1bae319f31a7ec4b748743914c62df Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mar 07 2018 00:03:28 +0000 Subject: 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 --- diff --git a/templates b/templates index f7ed122..a0ead45 100755 --- a/templates +++ b/templates @@ -199,7 +199,29 @@ product => { arch => "x86_64", 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 => "*", }, test_suite => { name => "install_default_upload" }, @@ -210,7 +232,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "install_default" }, @@ -243,7 +265,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "install_no_user" }, @@ -287,7 +309,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "base_selinux" }, @@ -331,7 +353,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "base_services_start" }, @@ -386,7 +408,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "base_service_manipulation" }, @@ -463,7 +485,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "base_system_logging" }, @@ -518,7 +540,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "desktop_terminal" }, @@ -551,7 +573,7 @@ product => { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", version => "*", }, test_suite => { name => "desktop_browser" }, @@ -1841,6 +1863,30 @@ 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", + machine => { name => "ppc64le" }, + prio => 10, + product => { + arch => "ppc64le", + distri => "fedora", flavor => "Server-boot-iso", version => "*", }, @@ -3412,6 +3458,18 @@ { 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", + distri => "fedora", flavor => "Workstation-boot-iso", name => "", settings => [ @@ -3538,7 +3596,7 @@ { arch => "x86_64", distri => "fedora", - flavor => "Workstation Ostree-dvd_ostree-iso", + flavor => "AtomicWorkstation-dvd_ostree-iso", name => "", settings => [ { key => "CANNED", value => "1" }, @@ -3591,6 +3649,18 @@ 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", distri => "fedora", flavor => "universal",