Merge pull request #160 from rocky-linux/develop
Merge #156 and #157 to main
This commit is contained in:
commit
345c83d991
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"area": [
|
||||||
|
{
|
||||||
|
"width": 664,
|
||||||
|
"ypos": 29,
|
||||||
|
"type": "match",
|
||||||
|
"height": 32,
|
||||||
|
"xpos": 78
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"properties": [],
|
||||||
|
"tags": [
|
||||||
|
"ENV-DISTRI-rocky",
|
||||||
|
"topbar_generic"
|
||||||
|
]
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 49 KiB |
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"area": [
|
||||||
|
{
|
||||||
|
"type": "match",
|
||||||
|
"xpos": 768,
|
||||||
|
"ypos": 9,
|
||||||
|
"width": 129,
|
||||||
|
"height": 27
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"properties": [],
|
||||||
|
"tags": [
|
||||||
|
"ENV-DISTRI-rocky",
|
||||||
|
"prerelease_note"
|
||||||
|
]
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"area": [
|
||||||
|
{
|
||||||
|
"width": 113,
|
||||||
|
"height": 18,
|
||||||
|
"xpos": 769,
|
||||||
|
"type": "match",
|
||||||
|
"ypos": 14
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"properties": [],
|
||||||
|
"tags": [
|
||||||
|
"ENV-DISTRI-rocky",
|
||||||
|
"version_8_ident"
|
||||||
|
]
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"area": [
|
||||||
|
{
|
||||||
|
"width": 59,
|
||||||
|
"ypos": 52,
|
||||||
|
"type": "match",
|
||||||
|
"height": 25,
|
||||||
|
"xpos": 548
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"properties": [],
|
||||||
|
"tags": [
|
||||||
|
"ENV-DISTRI-rocky",
|
||||||
|
"cockpit_services_entry"
|
||||||
|
]
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 69 KiB |
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"area": [
|
||||||
|
{
|
||||||
|
"xpos": 7,
|
||||||
|
"height": 27,
|
||||||
|
"width": 97,
|
||||||
|
"ypos": 10,
|
||||||
|
"type": "match"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"properties": [],
|
||||||
|
"tags": [
|
||||||
|
"ENV-DISTRI-rocky",
|
||||||
|
"cockpit_main"
|
||||||
|
]
|
||||||
|
}
|
Binary file not shown.
After Width: | Height: | Size: 76 KiB |
@ -727,7 +727,8 @@
|
|||||||
"rocky-universal-x86_64-*-64bit": 20
|
"rocky-universal-x86_64-*-64bit": 20
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"MIRRORLIST_GRAPHICAL": "1"
|
"MIRRORLIST_GRAPHICAL": "1",
|
||||||
|
"PACKAGE_SET": "server"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"install_multi": {
|
"install_multi": {
|
||||||
|
@ -11,8 +11,8 @@ sub run {
|
|||||||
$self->root_console(tty => 3);
|
$self->root_console(tty => 3);
|
||||||
|
|
||||||
# Enable the module.
|
# Enable the module.
|
||||||
my $name = "swig";
|
my $name = "ruby";
|
||||||
my $stream = "4.0";
|
my $stream = "3.1";
|
||||||
assert_script_run("dnf module enable -y $name:$stream");
|
assert_script_run("dnf module enable -y $name:$stream");
|
||||||
|
|
||||||
# Check that it is listed in the enabled list.
|
# Check that it is listed in the enabled list.
|
||||||
@ -30,8 +30,8 @@ sub run {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Disable some other module.
|
# Disable some other module.
|
||||||
my $name_alt = "postgresql";
|
my $name_alt = "ruby";
|
||||||
my $stream_alt = "13";
|
my $stream_alt = "3.1";
|
||||||
assert_script_run("dnf module disable -y $name_alt:$stream_alt");
|
assert_script_run("dnf module disable -y $name_alt:$stream_alt");
|
||||||
|
|
||||||
# Check that it is listed in the disabled list.
|
# Check that it is listed in the disabled list.
|
||||||
|
@ -10,8 +10,8 @@ sub run {
|
|||||||
$self->root_console(tty => 3);
|
$self->root_console(tty => 3);
|
||||||
|
|
||||||
# Install a Ruby module.
|
# Install a Ruby module.
|
||||||
my $name = "nodejs";
|
my $name = "ruby";
|
||||||
my $stream = "14";
|
my $stream = "3.1";
|
||||||
my $profile = "common";
|
my $profile = "common";
|
||||||
assert_script_run("dnf module install -y $name:$stream/$profile");
|
assert_script_run("dnf module install -y $name:$stream/$profile");
|
||||||
|
|
||||||
|
@ -16,36 +16,43 @@ sub run {
|
|||||||
# NOTE: In Rocky the baseos and appstream default repos include and add modules in the
|
# NOTE: In Rocky the baseos and appstream default repos include and add modules in the
|
||||||
# default installation where in Fedora all modules are in separate modular repos.
|
# default installation where in Fedora all modules are in separate modular repos.
|
||||||
# Until we figure out how to keep track of the count of expected enabled modular
|
# Until we figure out how to keep track of the count of expected enabled modular
|
||||||
# packages this will need to assume what appears to be the default in minimal.
|
# packages this will need to assume what appears to be the default in dvd-iso.
|
||||||
my $modules = script_output('dnf module list --enabled', timeout => 270);
|
my $modules = script_output('dnf module list --enabled', timeout => 270);
|
||||||
my @modules = parse_module_list($modules);
|
my @modules = parse_module_list($modules);
|
||||||
my $module_count = scalar @modules;
|
my $module_count = scalar @modules;
|
||||||
|
|
||||||
my $flavor = get_var('FLAVOR', 'minimal-iso');
|
my $flavor = get_var('FLAVOR', 'minimal-iso');
|
||||||
my $packageset = get_var('PACKAGE_SET', 'minimal');
|
my $packageset = get_var('PACKAGE_SET', 'graphical-server');
|
||||||
|
my $version = get_var('VERSION', 'none');
|
||||||
|
|
||||||
if ($flavor eq 'boot-iso') {
|
if ($version eq 'none') {
|
||||||
die "There seem to be enabled modules when the list should be empty." unless ($module_count == 0);
|
die "VERSION=9.1 or VERSION=8.8 or VERSION=8.7 need to be specified on the command line.";
|
||||||
} elsif ($flavor eq 'minimal-iso') {
|
} elsif ($version eq '9.1') {
|
||||||
if ($packageset eq 'minimal') {
|
die "Enabled modules ($module_count) is not equal to the default (0)." unless (scalar @modules == 0);
|
||||||
die "There seem to be enabled modules when the list should be empty." unless ($module_count == 0);
|
} elsif ($version eq '8.8' || $version eq '8.7') {
|
||||||
} elsif ($packageset eq 'server') {
|
if ($flavor eq 'boot-iso') {
|
||||||
die "There seem to be enabled modules when the list should be empty." unless ($module_count == 0);
|
die "There seem to be enabled modules when the list should be empty." unless ($module_count == 0);
|
||||||
|
} elsif ($flavor eq 'minimal-iso') {
|
||||||
|
if ($packageset eq 'minimal') {
|
||||||
|
die "There seem to be enabled modules when the list should be empty." unless ($module_count == 0);
|
||||||
|
} elsif ($packageset eq 'server') {
|
||||||
|
die "There seem to be enabled modules when the list should be empty." unless ($module_count == 0);
|
||||||
|
}
|
||||||
|
} elsif ($flavor eq 'dvd-iso' || $flavor eq 'universal') {
|
||||||
|
if ($packageset eq 'minimal') {
|
||||||
|
die "Enabled modules ($module_count) is not equal to the default (1)." unless (scalar @modules == 1);
|
||||||
|
} elsif ($packageset eq 'server') {
|
||||||
|
die "Enabled modules ($module_count) is not equal to the default (2)." unless (scalar @modules == 2);
|
||||||
|
} elsif ($packageset eq 'graphical-server') {
|
||||||
|
die "Enabled modules ($module_count) is not equal to the default (9)." unless (scalar @modules == 9);
|
||||||
|
} elsif ($packageset eq 'workstation') {
|
||||||
|
die "Enabled modules ($module_count) is not equal to the default (13)." unless (scalar @modules == 13);
|
||||||
|
} elsif ($packageset eq 'virtualization-host') {
|
||||||
|
die "Enabled modules ($module_count) is not equal to the default (2)." unless (scalar @modules == 2);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
die "Enabled modules ($module_count) is not equal to the default (0)." unless (scalar @modules == 0);
|
||||||
}
|
}
|
||||||
} elsif ($flavor eq 'dvd-iso' || $flavor eq 'universal') {
|
|
||||||
if ($packageset eq 'minimal') {
|
|
||||||
die "Enabled modules ($module_count) is not equal to the default (1)." unless (scalar @modules == 1);
|
|
||||||
} elsif ($packageset eq 'server') {
|
|
||||||
die "Enabled modules ($module_count) is not equal to the default (2)." unless (scalar @modules == 2);
|
|
||||||
} elsif ($packageset eq 'graphical-server') {
|
|
||||||
die "Enabled modules ($module_count) is not equal to the default (9)." unless (scalar @modules == 9);
|
|
||||||
} elsif ($packageset eq 'workstation') {
|
|
||||||
die "Enabled modules ($module_count) is not equal to the default (6)." unless (scalar @modules == 6);
|
|
||||||
} elsif ($packageset eq 'virtualization-host') {
|
|
||||||
die "Enabled modules ($module_count) is not equal to the default (2)." unless (scalar @modules == 2);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
die "Enabled modules ($module_count) is not equal to the default (2)." unless (scalar @modules == 2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Check that dnf lists the disabled modules.
|
# Check that dnf lists the disabled modules.
|
||||||
@ -59,7 +66,6 @@ sub run {
|
|||||||
die "There seem to be installed modules when the list should be empty." unless (scalar @modules == 0);
|
die "There seem to be installed modules when the list should be empty." unless (scalar @modules == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
||||||
# vim: set sw=4 et:
|
# vim: set sw=4 et:
|
||||||
|
Loading…
Reference in New Issue
Block a user