lib/anaconda.pm

@@ -296,8 +296,11 @@ 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:)/) {
-        my $arch = get_var("ARCH");
-        $repourl .= "/Everything/$arch/os";
+        # 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";
     }
     return $repourl;
 }

main.pm

@@ -236,6 +236,13 @@ 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);

needles/cockpit/login-textbox-20221215.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 111,
-      "type": "match",
-      "width": 81,
-      "height": 101,
-      "ypos": 241
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_login"
-  ]
-}

needles/cockpit/login-textbox-alt-20221215.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 111,
-      "ypos": 264,
-      "height": 101,
-      "width": 81
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_login"
-  ]
-}

needles/kde/desktop_expand_systray-20220324.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 17,
+      "ypos": 738,
+      "height": 18,
+      "xpos": 871
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-20220614.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 880,
+      "height": 18,
+      "width": 17,
+      "type": "match",
+      "ypos": 737
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-20220615.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 880,
+      "height": 18,
+      "width": 17,
+      "type": "match",
+      "ypos": 737
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-darkgrey-20210203.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 18,
+      "ypos": 738,
+      "xpos": 871,
+      "width": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-darkgrey-20210211.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 738,
+      "height": 18,
+      "xpos": 875,
+      "type": "match",
+      "width": 17
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-darkgrey-20210714.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 18,
+      "ypos": 738,
+      "type": "match",
+      "width": 17,
+      "xpos": 866
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-darkgrey-20210907.json

@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "ypos": 738,
+      "width": 17,
+      "xpos": 877,
+      "height": 18,
+      "match": 80
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-darkgrey-20220420.json

@@ -5,8 +5,7 @@
       "type": "match",
       "width": 17,
       "ypos": 737,
-      "height": 18,
-      "match": 90
+      "height": 18
     }
   ],
   "properties": [],
@@ -14,4 +13,4 @@
     "DESKTOP-kde",
     "desktop_expand_systray"
   ]
-}
+}

needles/kde/desktop_expand_systray-darkgrey-20220715.json

@@ -5,8 +5,7 @@
       "width": 17,
       "height": 18,
       "ypos": 737,
-      "type": "match",
-      "match": 90
+      "type": "match"
     }
   ],
   "properties": [],
@@ -14,4 +13,4 @@
     "DESKTOP-kde",
     "desktop_expand_systray"
   ]
-}
+}

needles/kde/desktop_expand_systray-grey-20210715.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 18,
+      "type": "match",
+      "ypos": 736,
+      "width": 17,
+      "xpos": 848
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-grey-20220204.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 737,
+      "xpos": 871,
+      "type": "match",
+      "height": 18,
+      "width": 17
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray-grey-20220225.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 871,
+      "width": 17,
+      "height": 18,
+      "ypos": 737,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ]
+}

needles/kde/desktop_expand_systray.json

@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 846,
+      "ypos": 743,
+      "width": 17,
+      "height": 18,
+      "type": "match"
+    }
+  ],
+  "tags": [
+    "DESKTOP-kde",
+    "desktop_expand_systray"
+  ],
+  "properties": []
+}

needles/kde/desktop_systray_notifications-dark-selected-20220713.json

@@ -5,7 +5,6 @@
       "height": 16,
       "ypos": 376,
       "type": "match",
-      "match": 90,
       "xpos": 601
     }
   ],
@@ -14,4 +13,4 @@
     "DESKTOP-kde",
     "desktop_systray_notifications"
   ]
-}
+}

needles/kde/desktop_update_notification_only-kde-20221215.json

@@ -1,23 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 392,
-      "xpos": 590,
-      "type": "match",
-      "height": 14,
-      "width": 132
-    },
-    {
-      "type": "match",
-      "width": 39,
-      "height": 173,
-      "ypos": 394,
-      "xpos": 969
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-kde",
-    "desktop_update_notification_only"
-  ]
-}

needles/kde/logout_confirm-kde-20221215.json

@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 434,
-      "ypos": 577,
-      "type": "match",
-      "height": 19,
-      "width": 45
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "log_out_confirm",
-    "power_off_confirm",
-    "restart_confirm"
-  ]
-}

needles/kde/user_confirm_jim_kde-20221215.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 35,
-      "ypos": 219,
-      "height": 17,
-      "width": 26,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "user_confirm_jim"
-  ]
-}

tests/_setup_browser.pm

@@ -7,15 +7,20 @@ 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 -y groupinstall 'base-x'", 300;
+    assert_script_run "dnf ${extraparams} -y groupinstall 'base-x'", 300;
     # FIXME: this should probably be in base-x...X seems to fail without
-    assert_script_run "dnf -y install libglvnd-egl", 180;
+    assert_script_run "dnf ${extraparams} -y install libglvnd-egl", 180;
     # try to avoid random weird font selection happening
-    assert_script_run "dnf -y install dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts", 180;
+    assert_script_run "dnf ${extraparams} -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 -y install dbus-glib", 180;
-    assert_script_run "dnf -y install firefox", 180;
+    assert_script_run "dnf ${extraparams} -y install dbus-glib", 180;
+    assert_script_run "dnf ${extraparams} -y install firefox", 180;
 }
 
 sub test_flags {

tests/_software_selection.pm

@@ -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') {
-        # we can't or don't want to check the selected package set in this case
+    if ($packageset eq 'default' || get_var('MODULAR')) {
+        # we can't or don't want to check the selected package set in these cases
         return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK'));
         $self->root_console;
         my $env = 'custom-environment';