testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-25 14:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pungi 4 conversion: handle Pungi-derived BUILD and FLAVOR

Browse Source 
With the arrival of Pungi 4, the scheduler is no longer using
fedfind-provided BUILD and FLAVOR values, but ones derived from
Pungi properties. BUILD is now simply the Pungi compose_id.
FLAVOR is produced by joining the Pungi variant, type, and
format with '-' characters as the separators.

Pungi, unfortunately, does not treat 'Rawhide' as a release, it
synthesizes a release number for Rawhide composes and places
that in the compose ID. To cope with that, for now, the
scheduler will set RAWHIDE to '1' if the compose is a Rawhide
one. As we have to adapt all places where we parse the release
in any case, this commit consolidates them into a fedorabase
subroutine.

For the one place where we also used to parse the 'milestone'
from fedfind, there is a placeholder get_milestone subroutine
which currently returns an empty string, as I don't yet have a
good handle on how to draw the kinds of distinctions fedfind
mapped to 'milestone' from Pungi metadata.
This commit is contained in:
Adam Williamson 2016-01-27 20:48:04 -08:00
parent abbba24ca4
commit 35735f21cd
7 changed files with 73 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VARIABLES.md
View File

@ -78,9 +78,11 @@ These variables should be set when tests are scheduled (when running `isos post`
| Variable | Explanation | | Variable | Explanation |
| -------- | ----------- | | -------- | ----------- |
| `ISO` | contains filename of ISO that is used for booting | | `ISO` | contains filename of ISO that is used for booting, if ISO is already downloaded |
| `ISOURL` | contains URL for ISO to boot, openQA will download it. Set this or `ISO`, not both |
| `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) | | `DISTRI` | contains distribution name (should be same as in WebUI, probably `fedora`) |
| `VERSION` | contains version of distribution | | `VERSION` | contains version of distribution |
| `FLAVOR` | indicates what type of distribution is used (`universal`, `generic_boot`, `workstation_live`, `server_boot`) | | `FLAVOR` | indicates what type of distribution is used. Three Pungi properties, joined with `-`: `variant`, `type`, and `format`. e.g.: `Server-dvd-iso`. Special value `universal` is used to schedule the group of tests that should be run once each per arch per compose, against the 'best' available ISO |
| `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) | | `ARCH` | is set to architecture that will be used (`x86_64`, `i686`) |
| `BUILD` | contains string `vv_tt_bb`, where `vv` is fedora version number, `tt` is release name (`Beta`, `Final`, ...) and `bb` is build (`RC3`, ...) | | `BUILD` | contains Pungi compose_id (something like `Fedora-24-20160121.n.3`) |
| `RAWHIDE` | set to 1 if this is a Rawhide compose (this is kind of a hack, see https://pagure.io/pungi/issue/134 ) |

16
lib/fedorabase.pm
View File

@ -88,6 +88,22 @@ sub boot_to_login_screen {
} }
} }
sub get_release {
my $self = shift;
if (get_var("RAWHIDE")) {
return 'rawhide';
}
else {
return lc((split /-/, get_var("BUILD"))[1]);
}
}
sub get_milestone {
my $self = shift;
# FIXME: we don't know how to do this with Pungi 4 yet.
return '';
}
1; 1;
# vim: set sw=4 et: # vim: set sw=4 et:

88
templates
View File

@ -12,7 +12,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -23,7 +23,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -34,7 +34,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_boot", flavor => "Server-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -45,7 +45,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_boot", flavor => "Server-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -56,7 +56,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -67,7 +67,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -78,7 +78,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -89,7 +89,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -100,7 +100,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_boot", flavor => "Workstation-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -111,7 +111,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_boot", flavor => "Workstation-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -122,7 +122,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -133,7 +133,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -144,7 +144,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "cloud_atomic_canned", flavor => "Cloud_Atomic-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -155,7 +155,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_selinux" }, test_suite => { name => "base_selinux" },
@ -166,7 +166,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_selinux" }, test_suite => { name => "base_selinux" },
@ -177,7 +177,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_selinux" }, test_suite => { name => "base_selinux" },
@ -188,7 +188,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_selinux" }, test_suite => { name => "base_selinux" },
@ -199,7 +199,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_services_start" }, test_suite => { name => "base_services_start" },
@ -210,7 +210,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_services_start" }, test_suite => { name => "base_services_start" },
@ -221,7 +221,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_services_start" }, test_suite => { name => "base_services_start" },
@ -232,7 +232,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_services_start" }, test_suite => { name => "base_services_start" },
@ -243,7 +243,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_service_manipulation" }, test_suite => { name => "base_service_manipulation" },
@ -254,7 +254,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_service_manipulation" }, test_suite => { name => "base_service_manipulation" },
@ -265,7 +265,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_service_manipulation" }, test_suite => { name => "base_service_manipulation" },
@ -276,7 +276,7 @@
product => { product => {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "base_service_manipulation" }, test_suite => { name => "base_service_manipulation" },
@ -727,7 +727,7 @@
product => { product => {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -738,7 +738,7 @@
product => { product => {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "server_boot", flavor => "Server-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -749,7 +749,7 @@
product => { product => {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -760,7 +760,7 @@
product => { product => {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -771,7 +771,7 @@
product => { product => {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "workstation_boot", flavor => "Workstation-boot-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -782,7 +782,7 @@
product => { product => {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
version => "*", version => "*",
}, },
test_suite => { name => "default_install" }, test_suite => { name => "default_install" },
@ -947,7 +947,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
name => "", name => "",
settings => [ settings => [
], ],
@ -956,7 +956,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_boot", flavor => "Server-boot-iso",
name => "", name => "",
settings => [ settings => [
], ],
@ -965,7 +965,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
name => "", name => "",
settings => [ settings => [
], ],
@ -974,7 +974,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "cloud_atomic_canned", flavor => "Cloud_Atomic-boot-iso",
name => "", name => "",
settings => [ settings => [
{ key => "CANNED", value => "1" } { key => "CANNED", value => "1" }
@ -984,7 +984,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_boot", flavor => "Workstation-boot-iso",
name => "", name => "",
settings => [ settings => [
{ key => "DESKTOP", value => "gnome" } { key => "DESKTOP", value => "gnome" }
@ -994,7 +994,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
name => "", name => "",
settings => [ settings => [
{ key => "LIVE", value => "1" }, { key => "LIVE", value => "1" },
@ -1005,7 +1005,7 @@
{ {
arch => "x86_64", arch => "x86_64",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
name => "", name => "",
settings => [ settings => [
{ key => "LIVE", value => "1" }, { key => "LIVE", value => "1" },
@ -1025,7 +1025,7 @@
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "generic_boot", flavor => "Everything-boot-iso",
name => "", name => "",
settings => [ settings => [
], ],
@ -1034,7 +1034,7 @@
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "server_boot", flavor => "Server-boot-iso",
name => "", name => "",
settings => [ settings => [
], ],
@ -1043,7 +1043,7 @@
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "server_dvd", flavor => "Server-dvd-iso",
name => "", name => "",
settings => [ settings => [
], ],
@ -1052,7 +1052,7 @@
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "workstation_boot", flavor => "Workstation-boot-iso",
name => "", name => "",
settings => [ settings => [
{ key => "DESKTOP", value => "gnome" } { key => "DESKTOP", value => "gnome" }
@ -1062,7 +1062,7 @@
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "workstation_live", flavor => "Workstation-live-iso",
name => "", name => "",
settings => [ settings => [
{ key => "LIVE", value => "1" }, { key => "LIVE", value => "1" },
@ -1073,7 +1073,7 @@
{ {
arch => "i386", arch => "i386",
distri => "fedora", distri => "fedora",
flavor => "kde_live", flavor => "KDE-live-iso",
name => "", name => "",
settings => [ settings => [
{ key => "LIVE", value => "1" }, { key => "LIVE", value => "1" },

5
tests/_boot_to_anaconda.pm
View File

@ -39,14 +39,11 @@ sub run {
unless (get_var("GRUB")){ unless (get_var("GRUB")){
get_kernel_line; get_kernel_line;
} }
my $fedora_version = "";
my $repourl = ""; my $repourl = "";
$fedora_version = lc((split /_/, get_var("BUILD"))[0]);
# REPOSITORY_VARIATION should be set to repository URL without version and architecture # REPOSITORY_VARIATION should be set to repository URL without version and architecture
# appended (it will be appended automatically) # appended (it will be appended automatically)
$repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; $repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
type_string " inst.repo=".$repourl; type_string " inst.repo=".$repourl;
} }

11
tests/install_source_graphical.pm
View File

@ -21,25 +21,20 @@ sub run {
# insert the url # insert the url
send_key "tab"; send_key "tab";
my $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
my $repourl = ""; my $repourl = "";
if ($fedora_version ne "rawhide"){ my $fedora_release = $self->get_release;
if (get_var("MIRRORLIST_GRAPHICAL")){
$fedora_version = "fedora-".$fedora_version;
}
}
# if either MIRRORLIST_GRAPHICAL or REPOSITORY_GRAPHICAL is set, type this into # if either MIRRORLIST_GRAPHICAL or REPOSITORY_GRAPHICAL is set, type this into
# the repository url input # the repository url input
if (get_var("MIRRORLIST_GRAPHICAL")){ if (get_var("MIRRORLIST_GRAPHICAL")){
$repourl = "mirrors.fedoraproject.org/mirrorlist?repo=".$fedora_version."&arch=".get_var('ARCH'); $repourl = "mirrors.fedoraproject.org/mirrorlist?repo=".$fedora_release."&arch=".get_var('ARCH');
type_string $repourl; type_string $repourl;
# select as mirror list # select as mirror list
assert_and_click "anaconda_install_source_repo_select_mirrorlist"; assert_and_click "anaconda_install_source_repo_select_mirrorlist";
} }
elsif (get_var("REPOSITORY_GRAPHICAL")){ elsif (get_var("REPOSITORY_GRAPHICAL")){
$repourl = get_var("REPOSITORY_GRAPHICAL")."/".$fedora_version."/".get_var("ARCH")."/os"; $repourl = get_var("REPOSITORY_GRAPHICAL")."/".$fedora_release."/".get_var("ARCH")."/os";
type_string $repourl; type_string $repourl;
} }

4
tests/install_source_variation.pm
View File

@ -8,11 +8,9 @@ sub run {
# Anaconda hub # Anaconda hub
assert_screen "anaconda_main_hub"; assert_screen "anaconda_main_hub";
# FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate
my $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
my $repourl = ""; my $repourl = "";
$repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; $repourl = get_var("REPOSITORY_VARIATION")."/".$self->get_release."/".get_var("ARCH")."/os";
# check that the repo was used # check that the repo was used
$self->root_console; $self->root_console;

5
tests/upgrade_run.pm
View File

@ -3,8 +3,9 @@ use strict;
use testapi; use testapi;
sub run { sub run {
my $release = lc(get_var('VERSION')); my $release = $self->get_release;
my $milestone = lc((split /_/, get_var("BUILD"))[1]); # NOTE: this doesn't actually work yet, it's a FIXME in fedorabase
my $milestone = $self->get_milestone;
my $args = "--releasever=${release}"; my $args = "--releasever=${release}";
# This is excessive - after the Bodhi activation point we don't # This is excessive - after the Bodhi activation point we don't
# need --nogpgcheck for Branched. But that's hard to detect magically # need --nogpgcheck for Branched. But that's hard to detect magically