Add a test of an additional repository using a metalink (#198)

As suggested by @kparal, this adds a test that specifies an
additional repository using a metalink. The repository contains
a single package, 'testpackage', that supplements glibc (so it
should always get installed). The test runs an install then
checks that testpackage got installed.

We also deduplicate a pair of needles which were matching on the
same anaconda UI feature (an "add" button) and use that same
needle in this test.

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

lib/anaconda.pm

@@ -126,7 +126,7 @@ sub custom_blivet_add_partition {
     );
     $args{devicetype} = "raid" if $args{raid1};
 
-    assert_and_click "anaconda_blivet_part_add";
+    assert_and_click "anaconda_add";
     mouse_set(10, 10);
     if ($args{devicetype}) {
         assert_and_click "anaconda_blivet_part_devicetype";

main.pm

@@ -173,7 +173,7 @@ sub load_install_tests() {
     }
 
     ## Installation source
-    if (get_var('MIRRORLIST_GRAPHICAL') || get_var("REPOSITORY_GRAPHICAL")) {
+    if (get_var('MIRRORLIST_GRAPHICAL') || get_var("REPOSITORY_GRAPHICAL") || get_var("ADD_REPOSITORY_GRAPHICAL")) {
         autotest::loadtest "tests/install_source_graphical.pm";
         autotest::loadtest "tests/_check_install_source.pm";
     }

needles/anaconda/partitioning/add.json

@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "anaconda_part_add"
-  ],
-  "area": [
-    {
-      "xpos": 22,
-      "ypos": 630,
-      "width": 53,
-      "height": 14,
-      "type": "match"
-    }
-  ]
-}

needles/anaconda/universal/add.json

@@ -10,6 +10,6 @@
   ],
   "properties": [],
   "tags": [
-    "anaconda_blivet_part_add"
+    "anaconda_add"
   ]
 }

templates.fif.json

@@ -1007,6 +1007,17 @@
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }
         },
+        "install_addrepo_metalink_graphical": {
+            "profiles": {
+                "fedora-universal-aarch64-*-aarch64": 50,
+                "fedora-universal-ppc64le-*-ppc64le": 50,
+                "fedora-universal-x86_64-*-64bit": 50
+            },
+            "settings": {
+                "ADD_REPOSITORY_GRAPHICAL": "ml:https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-2.xml",
+                "POSTINSTALL": "_addrepo_metalink_post"
+            }
+        },
         "install_anaconda_text": {
             "profiles": {
                 "fedora-universal-aarch64-*-aarch64": 20,

tests/_addrepo_metalink_post.pm

@@ -0,0 +1,16 @@
+use base "installedtest";
+use strict;
+use testapi;
+
+sub run {
+    # check the test package from the side repo was installed
+    assert_script_run "rpm -q testpackage";
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et:

tests/_boot_to_anaconda.pm

@@ -33,7 +33,7 @@ sub run {
     # Construct inst.addrepo arg for ADD_REPOSITORY_VARIATION
     my $repourl = get_var("ADD_REPOSITORY_VARIATION");
     if ($repourl) {
-        $params .= "inst.addrepo=addrepo," . get_full_repo($repourl) . " ";
+        $params .= "inst.addrepo=addrepo,$repourl ";
     }
     if (get_var("ANACONDA_TEXT")) {
         $params .= "inst.text ";

tests/_check_install_source.pm

@@ -12,6 +12,8 @@ sub run {
         $repourl = get_mirrorlist_url();
     }
     else {
+        # we kinda intentionally don't check ADD_REPOSITORY_GRAPHICAL
+        # here, as we cover that case with a postinstall check
         $repourl = get_var("REPOSITORY_VARIATION", get_var("REPOSITORY_GRAPHICAL"));
         $repourl = get_full_repo($repourl) if ($repourl);
         $addrepourl = get_var("ADD_REPOSITORY_VARIATION");

tests/disk_custom_blivet_btrfs_preserve_home.pm

@@ -91,7 +91,7 @@ sub run {
     }
 
     # Add new root partition
-    assert_and_click "anaconda_blivet_part_add";
+    assert_and_click "anaconda_add";
     # Select the name textfield
     send_key_until_needlematch("anaconda_blivet_part_name_selected", "tab", 3, 5);
     # type the new name

tests/disk_custom_btrfs_preserve_home.pm

@@ -59,7 +59,7 @@ sub run {
     assert_and_click "anaconda_part_confirm_delete";
 
     # Add the new root partition to the scheme
-    assert_and_click "anaconda_part_add";
+    assert_and_click "anaconda_add";
     type_very_safely "/\n";
 
     # Confirm changes

tests/disk_custom_resize_lvm.pm

@@ -66,7 +66,7 @@ sub run {
     assert_screen "device_root_resized_thirteen";
 
     # Add new /home partition into the emptied space.
-    assert_and_click "anaconda_part_add";
+    assert_and_click "anaconda_add";
 
     # The previous step brings us into a mountpoint field
     # of the pop-up window, so we only need to fill the value in.

tests/disk_custom_with_swap.pm

@@ -21,7 +21,7 @@ sub run {
     assert_and_click "anaconda_part_update_settings";
     wait_still_screen 5;
     # Add swap
-    assert_and_click "anaconda_part_add";
+    assert_and_click "anaconda_add";
     type_very_safely "swap";
     send_key "tab";
     assert_and_click "anaconda_part_add_mountpoint";

tests/install_source_graphical.pm

@@ -5,14 +5,7 @@ use utils;
 use anaconda;
 use Time::HiRes qw( usleep );
 
-sub run {
+sub main_repo {
-    my $self = shift;
-    # Anaconda hub
-    assert_screen "anaconda_main_hub", 300; #
-
-    # Go into the Install Source spoke
-    assert_and_click "anaconda_main_hub_installation_source";
-
     # select appropriate protocol on the network
     assert_and_click "anaconda_install_source_on_the_network";
     send_key "tab";
@@ -56,11 +49,56 @@ sub run {
         $repourl =~ s/^nfsvers=.://;
         type_safely $repourl;
     }
+}
+
+sub add_repo {
+    my $repourl = get_var("ADD_REPOSITORY_GRAPHICAL");
+    my $metalink;
+    if ($repourl =~ m/^ml:/) {
+        $metalink = 1;
+        $repourl =~ s/^ml://;
+    }
+    # configure an additional repository
+    assert_and_click "anaconda_add";
+    # shift-tab seven times gets us to the scheme box
+    for (my $i=0; $i<7; $i++) {
+        send_key "shift-tab";
+        usleep 100;
+    }
+    # select appropriate repo type for the URL by pressing 'down' a given
+    # number of times. default - 1 - is https
+    my $num = 1;
+    for (my $i=0; $i<$num; $i++) {
+        send_key "down";
+        usleep 100;
+    }
+    send_key "tab";
+    type_string $repourl;
+    if ($metalink) {
+        # select metalink in URL type dropdown
+        send_key "tab";
+        send_key "down";
+        send_key "down";
+    }
+}
+
+sub run {
+    my $self = shift;
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300;
+
+    # Go into the Install Source spoke
+    assert_and_click "anaconda_main_hub_installation_source";
+
+    main_repo() if (get_var("REPOSITORY_GRAPHICAL") || get_var("MIRRORLIST_GRAPHICAL"));
+    add_repo() if (get_var("ADD_REPOSITORY_GRAPHICAL"));
 
     assert_and_click "anaconda_spoke_done";
 
     # Anaconda hub
     assert_screen "anaconda_main_hub", 300;
+
+
 }
 
 sub test_flags {