srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

Drop all handling of MODULAR 

This was from years ago when we briefly did "modular composes".
That died and ain't coming back.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-12-15 11:10:40 -08:00
parent 51d79a5435
commit 3754ab3d8a
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/anaconda.pm
View File

@ -296,11 +296,8 @@ sub get_full_repo {
# repo URL with flavor and arch, leave hd & NFS ones alone
# (as for those tests we just use a mounted ISO and URL is complete)
if ($repourl !~ m/^(nfs|hd:)/) {
# Everything variant doesn't exist for modular composes atm,
# only Server
my $variant = 'Everything';
$variant = 'Server' if (get_var("MODULAR"));
$repourl .= "/${variant}/" . get_var("ARCH") . "/os";
my $arch = get_var("ARCH");
$repourl .= "/Everything/$arch/os";
}
return $repourl;
}

7
main.pm
View File

@ -236,13 +236,6 @@ sub _load_early_postinstall_tests {
_load_instance("tests/disk_guided_encrypted_postinstall", $instance);
}
# For now, there's no possibility to get a graphical desktop on
# Modular composes, so short-circuit here for those
if (get_var("MODULAR")) {
_load_instance("tests/_console_wait_login", $instance);
return;
}
# Appropriate login method for install type
if (get_var("DESKTOP")) {
_load_instance("tests/_graphical_wait_login", $instance);

15
tests/_setup_browser.pm
View File

@ -7,20 +7,15 @@ sub run {
my $self = shift;
# set up appropriate repositories
repo_setup();
# use --enablerepo=fedora for Modular compose testing (we need to
# create and use a non-Modular repo to get some packages which
# aren't in Modular Server composes)
my $extraparams = '';
$extraparams = '--enablerepo=fedora' if (get_var("MODULAR"));
# install a desktop and firefox so we can actually try it
assert_script_run "dnf ${extraparams} -y groupinstall 'base-x'", 300;
assert_script_run "dnf -y groupinstall 'base-x'", 300;
# FIXME: this should probably be in base-x...X seems to fail without
assert_script_run "dnf ${extraparams} -y install libglvnd-egl", 180;
assert_script_run "dnf -y install libglvnd-egl", 180;
# try to avoid random weird font selection happening
assert_script_run "dnf ${extraparams} -y install dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts", 180;
assert_script_run "dnf -y install dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts", 180;
# since firefox-85.0-2, firefox doesn't seem to run without this
assert_script_run "dnf ${extraparams} -y install dbus-glib", 180;
assert_script_run "dnf ${extraparams} -y install firefox", 180;
assert_script_run "dnf -y install dbus-glib", 180;
assert_script_run "dnf -y install firefox", 180;
}
sub test_flags {

4
tests/_software_selection.pm
View File

@ -10,8 +10,8 @@ sub run {
# Select package set. Minimal is the default, if 'default' is specified, skip selection,
# but verify correct default in some cases
my $packageset = get_var('PACKAGE_SET', 'minimal');
if ($packageset eq 'default' || get_var('MODULAR')) {
# we can't or don't want to check the selected package set in these cases
if ($packageset eq 'default') {
# we can't or don't want to check the selected package set in this case
return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK'));
$self->root_console;
my $env = 'custom-environment';