diff --git a/lib/modularity.pm b/lib/modularity.pm index ac3585d3..2b51e579 100644 --- a/lib/modularity.pm +++ b/lib/modularity.pm @@ -23,7 +23,7 @@ sub parse_module_list { foreach my $line (@output_lines) { my ($module, $stream, $profile) = split(/\s+/, $line); - unless ($module =~ /Fedora|Last|Hint|Name|^$/) { + unless ($module =~ /Rocky|Last|Hint|Name|^$/) { $profile =~ s/,$//; my %module = ("module" => $module, "stream" => $stream, "profile" => $profile); push(@parsed_list, \%module); diff --git a/needles/anaconda/identification/rocky-leftbar_generic-20210805.json b/needles/anaconda/identification/rocky-leftbar_generic-20210805.json index e405bf13..254f1e6a 100644 --- a/needles/anaconda/identification/rocky-leftbar_generic-20210805.json +++ b/needles/anaconda/identification/rocky-leftbar_generic-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "leftbar_generic" ] } \ No newline at end of file diff --git a/needles/anaconda/identification/rocky-leftbar_server-20210809.json b/needles/anaconda/identification/rocky-leftbar_server-20210809.json index 47305f5e..008b154c 100644 --- a/needles/anaconda/identification/rocky-leftbar_server-20210809.json +++ b/needles/anaconda/identification/rocky-leftbar_server-20210809.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "leftbar_server" ] } \ No newline at end of file diff --git a/needles/anaconda/identification/rocky-topbar_generic-20210807.json b/needles/anaconda/identification/rocky-topbar_generic-20210807.json index 3ead9a62..b722285b 100644 --- a/needles/anaconda/identification/rocky-topbar_generic-20210807.json +++ b/needles/anaconda/identification/rocky-topbar_generic-20210807.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "topbar_generic" ] } \ No newline at end of file diff --git a/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json b/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json index 71c65fc9..7e084f65 100644 --- a/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json +++ b/needles/anaconda/lang_select/rocky-install_lang_english_selected-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "anaconda_select_install_lang_selected", "anaconda_select_install_lang_filtered", "LANGUAGE-english" diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json index 51e81bfb..37281c6a 100644 --- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json +++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8.4_ident-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "version_8.4_ident" ] } \ No newline at end of file diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json index dccb2210..b3a59037 100644 --- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json +++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "version_8_ident" ] } diff --git a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json index d60fb7b5..daf8cba7 100644 --- a/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json +++ b/needles/anaconda/main_hub/rocky-boot_to_anaconda-version_greenobsidian_ident-20210807.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "version_greenobsidian_ident" ] -} +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210909.json b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210909.json new file mode 100644 index 00000000..5ba4ba32 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210909.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 44, + "ypos": 146, + "width": 381, + "height": 13, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_graphical-server_highlighted" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210909.png b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210909.png new file mode 100644 index 00000000..0af00c7f Binary files /dev/null and b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210909.png differ diff --git a/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210914.json b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210914.json new file mode 100644 index 00000000..f4537be3 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210914.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 46, + "ypos": 127, + "width": 222, + "height": 34, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_graphical-server_highlighted" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210914.png b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210914.png new file mode 100644 index 00000000..88c5af1a Binary files /dev/null and b/needles/anaconda/package_selection/rocky-graphical-server_highlighted-20210914.png differ diff --git a/needles/anaconda/package_selection/rocky-graphical-server_selected-20210909.json b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210909.json new file mode 100644 index 00000000..8d533f29 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210909.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 28, + "ypos": 129, + "width": 397, + "height": 30, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_graphical-server_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-graphical-server_selected-20210909.png b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210909.png new file mode 100644 index 00000000..0af00c7f Binary files /dev/null and b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210909.png differ diff --git a/needles/anaconda/package_selection/rocky-graphical-server_selected-20210914.json b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210914.json new file mode 100644 index 00000000..d953d759 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210914.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 27, + "ypos": 126, + "width": 243, + "height": 34, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_graphical-server_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-graphical-server_selected-20210914.png b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210914.png new file mode 100644 index 00000000..a0b6e6cd Binary files /dev/null and b/needles/anaconda/package_selection/rocky-graphical-server_selected-20210914.png differ diff --git a/needles/anaconda/package_selection/rocky-anaconda_server_selected-20210812.json b/needles/anaconda/package_selection/rocky-server_selected-20210812.json similarity index 100% rename from needles/anaconda/package_selection/rocky-anaconda_server_selected-20210812.json rename to needles/anaconda/package_selection/rocky-server_selected-20210812.json diff --git a/needles/anaconda/package_selection/rocky-anaconda_server_selected-20210812.png b/needles/anaconda/package_selection/rocky-server_selected-20210812.png similarity index 100% rename from needles/anaconda/package_selection/rocky-anaconda_server_selected-20210812.png rename to needles/anaconda/package_selection/rocky-server_selected-20210812.png diff --git a/needles/anaconda/package_selection/rocky-virtualization-host_highlighted-20210914.json b/needles/anaconda/package_selection/rocky-virtualization-host_highlighted-20210914.json new file mode 100644 index 00000000..c61522c3 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-virtualization-host_highlighted-20210914.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 27, + "ypos": 318, + "width": 177, + "height": 32, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_virtualization-host_highlighted" + ] +} diff --git a/needles/anaconda/package_selection/rocky-virtualization-host_highlighted-20210914.png b/needles/anaconda/package_selection/rocky-virtualization-host_highlighted-20210914.png new file mode 100644 index 00000000..a6955bcb Binary files /dev/null and b/needles/anaconda/package_selection/rocky-virtualization-host_highlighted-20210914.png differ diff --git a/needles/anaconda/package_selection/rocky-virtualization-host_selected-20210914.json b/needles/anaconda/package_selection/rocky-virtualization-host_selected-20210914.json new file mode 100644 index 00000000..32ebe7ef --- /dev/null +++ b/needles/anaconda/package_selection/rocky-virtualization-host_selected-20210914.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 28, + "ypos": 318, + "width": 181, + "height": 31, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_virtualization-host_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-virtualization-host_selected-20210914.png b/needles/anaconda/package_selection/rocky-virtualization-host_selected-20210914.png new file mode 100644 index 00000000..399e9353 Binary files /dev/null and b/needles/anaconda/package_selection/rocky-virtualization-host_selected-20210914.png differ diff --git a/needles/anaconda/package_selection/rocky-virtualization_highlighted-20210909.json b/needles/anaconda/package_selection/rocky-virtualization_highlighted-20210909.json new file mode 100644 index 00000000..adcabcd9 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-virtualization_highlighted-20210909.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "width": 125, + "height": 13, + "type": "match", + "xpos": 48, + "ypos": 335 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_virtualization-host_highlighted" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-virtualization_highlighted-20210909.png b/needles/anaconda/package_selection/rocky-virtualization_highlighted-20210909.png new file mode 100644 index 00000000..a6955bcb Binary files /dev/null and b/needles/anaconda/package_selection/rocky-virtualization_highlighted-20210909.png differ diff --git a/needles/anaconda/package_selection/rocky-workstation_highlighted-20210909.json b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210909.json new file mode 100644 index 00000000..6b4d611b --- /dev/null +++ b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210909.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 48, + "type": "match", + "ypos": 244, + "width": 271, + "height": 29 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_workstation_highlighted" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-workstation_highlighted-20210909.png b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210909.png new file mode 100644 index 00000000..2513aaf6 Binary files /dev/null and b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210909.png differ diff --git a/needles/anaconda/package_selection/rocky-workstation_highlighted-20210914.json b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210914.json new file mode 100644 index 00000000..558b36d2 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210914.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 27, + "ypos": 242, + "width": 246, + "height": 33, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_workstation_highlighted" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-workstation_highlighted-20210914.png b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210914.png new file mode 100644 index 00000000..41f574a1 Binary files /dev/null and b/needles/anaconda/package_selection/rocky-workstation_highlighted-20210914.png differ diff --git a/needles/anaconda/package_selection/rocky-workstation_selected-20210909.json b/needles/anaconda/package_selection/rocky-workstation_selected-20210909.json new file mode 100644 index 00000000..9477082a --- /dev/null +++ b/needles/anaconda/package_selection/rocky-workstation_selected-20210909.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "width": 290, + "height": 31, + "ypos": 242, + "type": "match", + "xpos": 29 + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_workstation_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-workstation_selected-20210909.png b/needles/anaconda/package_selection/rocky-workstation_selected-20210909.png new file mode 100644 index 00000000..3899bc9b Binary files /dev/null and b/needles/anaconda/package_selection/rocky-workstation_selected-20210909.png differ diff --git a/needles/anaconda/package_selection/rocky-workstation_selected-20210914.json b/needles/anaconda/package_selection/rocky-workstation_selected-20210914.json new file mode 100644 index 00000000..a8a57c05 --- /dev/null +++ b/needles/anaconda/package_selection/rocky-workstation_selected-20210914.json @@ -0,0 +1,16 @@ +{ + "area": [ + { + "xpos": 28, + "ypos": 241, + "width": 247, + "height": 32, + "type": "match" + } + ], + "properties": [], + "tags": [ + "ENV-DISTRI-rocky", + "anaconda_workstation_selected" + ] +} \ No newline at end of file diff --git a/needles/anaconda/package_selection/rocky-workstation_selected-20210914.png b/needles/anaconda/package_selection/rocky-workstation_selected-20210914.png new file mode 100644 index 00000000..3899bc9b Binary files /dev/null and b/needles/anaconda/package_selection/rocky-workstation_selected-20210914.png differ diff --git a/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json b/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json index d6c9bbfb..bd77b45b 100644 --- a/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json +++ b/needles/anaconda/partitioning/rocky-fs_ext4-20210813.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "anaconda_part_fs_ext4" ] } \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json b/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json index de88e44f..794a1324 100644 --- a/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json +++ b/needles/anaconda/partitioning/rocky-fs_ext4_preselected-20210812.json @@ -12,6 +12,6 @@ "tags": [ "anaconda_part_fs", "anaconda_part_fs_ext4_selected", - "ENV-DISTRI-fedora" + "ENV-DISTRI-rocky", ] } \ No newline at end of file diff --git a/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json b/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json index cf9226c9..df69348a 100644 --- a/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json +++ b/needles/anaconda/partitioning/rocky-fs_xfs_preselected-20210812.json @@ -10,7 +10,7 @@ ], "properties": [], "tags": [ - "ENV-DISTRI-fedora", + "ENV-DISTRI-rocky", "anaconda_part_fs", "anaconda_part_fs_xfs_selected" ] diff --git a/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json b/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json index 4af8343b..f31f61f2 100644 --- a/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json +++ b/needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json @@ -10,7 +10,7 @@ ], "properties": [], "tags": [ - "DISTRI-rocky", + "ENV-DISTRI-rocky", "LANGUAGE-english", "anaconda_manual_partitioning" ] diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20210814.json b/needles/cockpit/rocky-autoupdate_planned_day-20210814.json index 9ea9624d..b4b4cdfa 100644 --- a/needles/cockpit/rocky-autoupdate_planned_day-20210814.json +++ b/needles/cockpit/rocky-autoupdate_planned_day-20210814.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "autoupdate_planned_day" ] } \ No newline at end of file diff --git a/needles/cockpit/rocky-cockpit_login-20210814.json b/needles/cockpit/rocky-cockpit_login-20210814.json index 44c193f4..6f6d8ab3 100644 --- a/needles/cockpit/rocky-cockpit_login-20210814.json +++ b/needles/cockpit/rocky-cockpit_login-20210814.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "cockpit_login" ] } \ No newline at end of file diff --git a/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json b/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json index 9f9aa929..fb801be5 100644 --- a/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json +++ b/needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json @@ -14,6 +14,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "cockpit_updates_auto_all" ] } \ No newline at end of file diff --git a/needles/console/rocky-bootloader-bios-20210805.json b/needles/console/rocky-bootloader-bios-20210805.json index 375720bf..735f31c9 100644 --- a/needles/console/rocky-bootloader-bios-20210805.json +++ b/needles/console/rocky-bootloader-bios-20210805.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ + "ENV-DISTRI-rocky", "bootloader", "bootloader_bios" ] diff --git a/tests/modularity_module_list.pm b/tests/modularity_module_list.pm index ea7ad7c1..d14f23e3 100644 --- a/tests/modularity_module_list.pm +++ b/tests/modularity_module_list.pm @@ -19,19 +19,34 @@ sub run { # packages this will need to assume what appears to be the default in minimal. my $modules = script_output('dnf module list --enabled', timeout => 270); my @modules = parse_module_list($modules); - die "Enabled modules is less than the default (3)." unless (scalar @modules < 3); - die "Enabled modules is greater than the default (3)." unless (scalar @modules > 3); + my $module_count = scalar @modules; - # More advanced... loop over default modules and check them directly. The is_listed - # bit comes from modularity_enable_disable_module.pm + my $flavor = get_var('FLAVOR', 'minimal-iso'); + my $packageset = get_var('PACKAGE_SET', 'minimal'); - #perl 5.26 [d][e] - #perl-IO-Socket-SSL 2.066 [d][e] - #perl-libwww-perl 6.34 [d][e] - #my @enabled_modules = parse_module_list($enabled); - #unless (is_listed($name, $stream, \@enabled_modules)) { - # die "The enabled module is not listed in the list of enabled modules but it should be."; - #} + if ($flavor eq 'boot-iso') { + 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 (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. $modules = script_output('dnf module list --disabled', timeout => 270);