Fixes for modularity_tests on rocky-8.4-dvd-iso-x86_64 (#46)

* package_selection needle updates

* canonicalize needles JSON and fix conflict

* updates for modularity_tests
- currently passes when _console_wait_login follows 
_do_install_and_reboot
- when _graphical_wait_login is fixed for 
PACKAGE_SET={graphical-server|workstation} then 
modularity_module_list.pm must be validated

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);

needles/anaconda/identification/rocky-leftbar_generic-20210805.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "leftbar_generic"
   ]
 }

needles/anaconda/identification/rocky-leftbar_server-20210809.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "leftbar_server"
   ]
 }

needles/anaconda/identification/rocky-topbar_generic-20210807.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "topbar_generic"
   ]
 }

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"

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"
   ]
 }

needles/anaconda/main_hub/rocky-boot_to_anaconda-version_8_ident.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "version_8_ident"
   ]
 }

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"
   ]
-}
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

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"
+  ]
+}

needles/anaconda/partitioning/rocky-fs_ext4-20210813.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "anaconda_part_fs_ext4"
   ]
 }

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",
   ]
 }

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"
   ]

needles/anaconda/partitioning/rocky-manual_partitioning-20210812.json

@@ -10,7 +10,7 @@
   ],
   "properties": [],
   "tags": [
-    "DISTRI-rocky",
+    "ENV-DISTRI-rocky",
     "LANGUAGE-english",
     "anaconda_manual_partitioning"
   ]

needles/cockpit/rocky-autoupdate_planned_day-20210814.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "autoupdate_planned_day"
   ]
 }

needles/cockpit/rocky-cockpit_login-20210814.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "cockpit_login"
   ]
 }

needles/cockpit/rocky-cockpit_updates_auto_all-20210814.json

@@ -14,6 +14,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "cockpit_updates_auto_all"
   ]
 }

needles/console/rocky-bootloader-bios-20210805.json

@@ -10,6 +10,7 @@
   ],
   "properties": [],
   "tags": [
+    "ENV-DISTRI-rocky",
     "bootloader",
     "bootloader_bios"
   ]

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);