cockpit updates: drop the security branch, update 'ignore' needle

This branch is very fragile, because the test won't fail if we
miss the match on the security needle. So in practice, we are
never going to notice when the needle goes stale, and we'll just
wind up never triggering this branch and always going down the
other path. That's the current situation: the security_install
needle last matched more than a year ago at least. Let's just
admit the truth here and drop the branch entirely.

Also update the cockpit_updates_restart_ignore needle. This is
in a similar case - we don't really notice when it goes stale,
as the test completes, it just takes a bit longer - but since
this one is quite easy to find, let's just update it instead of
dropping it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

needles/cockpit/cockpit_updates_restart_ignore-20191129.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 19,
-      "xpos": 543,
-      "ypos": 340,
-      "width": 51
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_updates_restart_ignore"
-  ]
-}

needles/cockpit/cockpit_updates_restart_ignore-20230428.json

@@ -1,11 +1,11 @@
 {
   "area": [
     {
+      "width": 51,
+      "ypos": 441,
       "height": 19,
       "type": "match",
-      "ypos": 301,
-      "width": 51,
-      "xpos": 562
+      "xpos": 675
     }
   ],
   "properties": [],

needles/cockpit/cockpit_updates_security_install.json

@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "cockpit_updates_security_install"
-  ],
-  "area": [
-    {
-      "xpos": 619,
-      "ypos": 267,
-      "width": 93,
-      "height": 16,
-      "type": "match"
-    }
-  ]
-}

tests/server_cockpit_updates.pm

@@ -21,20 +21,6 @@ sub run {
     select_cockpit_update();
 
 
-    # If security updates are available, install them first,
-    # so that we test the most buttons in one go.
-    # After updates, ignore restart because we do not need
-    # restarting the machine to continue. Also, we would have
-    # to deal with much more complicated workflow.
-    #
-    if (check_screen('cockpit_updates_security_install', 1)) {
-        assert_and_click 'cockpit_updates_security_install';
-        sleep 60;    # wait until things are installed
-        assert_and_click 'cockpit_updates_restart_ignore';
-        wait_still_screen 2;
-    }
-
-
     # Install the rest of the updates, or any updates
     # that have not been previously installed.
     assert_and_click 'cockpit_updates_all_install';