#1 PowerPC specific changes for Fedora os-autoinst-distri-fedora
Merged 6 years ago by adamwill. Opened 6 years ago by michelmno.
fedora-qa/ michelmno/os-autoinst-distri-fedora tempo12  into  master

file modified
+17 -5
@@ -193,10 +193,11 @@ 

          first => 1,

          timeout => 30,

          uefi => get_var("UEFI"),

+         ofw => get_var("OFW"),

          @_

      );

-     # if not postinstall and not UEFI, syslinux

-     $args{bootloader} //= ($args{uefi} || $args{postinstall}) ? "grub" : "syslinux";

+     # if not postinstall not UEFI and not ofw, syslinux

+     $args{bootloader} //= ($args{uefi} || $args{postinstall} || $args{ofw}) ? "grub" : "syslinux";

      if ($args{uefi}) {

          # we use the firmware-type specific tags because we want to be

          # sure we actually did a UEFI boot
@@ -223,14 +224,25 @@ 

              send_key "e";

              # ternary: 13 'downs' to reach the kernel line for installed

              # system, 2 for UEFI installer

-             my $presses = $args{postinstall} ? 13 : 2;

+             # since 20170328 PowerPC Rawhide and f26 are failing with 13

+             # but work with 12 and added sleep 1 in loop.

+             my $presses;

+             if (get_var('OFW')) {

+                 $presses = $args{postinstall} ? 12 : 2;

+ 	    } else {

+                 $presses = $args{postinstall} ? 13 : 2;

+             }

              foreach my $i (1..$presses) {

+                 sleep 1; # seems to have missed one down if too fast.

                  send_key "down";

              }

              send_key "end";

          }

-         type_string " $args{params}";

+         # Change type_string by type_safely because keyboard polling

+         # in SLOF usb-xhci driver failed sometimes in powerpc

+         type_safely " $args{params}";

      }

+     save_screenshot; # for debug purpose

      # ctrl-X boots from grub editor mode

      send_key "ctrl-x";

      # return boots all other cases
@@ -309,7 +321,7 @@ 

      # and we don't want to bother testing or predicting its existence;

      # assert_script_run doesn't buy you much with sed anyway as it'll

      # return 0 even if it replaced nothing

-     script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl.*basearch,baseurl=${location}/Everything/\$basearch,g' /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;

+     script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl.*basearch,baseurl=${location}/Everything/\$basearch,g' -e 's,^#baseurl.*source,baseurl=${location}/Everything/source,g' /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;

      script_run "cat /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;

  }

  

@@ -0,0 +1,15 @@ 

+ {

+   "tags": [

+     "anaconda_workstation_selected"

+   ],

+   "properties": [],

+   "area": [

+     {

+       "height": 13,

+       "width": 145,

+       "ypos": 254,

+       "xpos": 28,

+       "type": "match"

+     }

+   ]

+ }

@@ -0,0 +1,15 @@ 

+ {

+   "area": [

+     {

+       "xpos": 409,

+       "ypos": 311,

+       "width": 100,

+       "height": 17,

+       "type": "match"

+     }

+   ],

+   "tags": [

+     "anaconda_blivet_part_fs_ppc_prep_boot"

+   ],

+   "properties": []

+ } 

\ No newline at end of file

@@ -0,0 +1,36 @@ 

+ {

+   "tags": [

+     "anaconda_main_hub_text"

+   ],

+   "area": [

+     {

+       "xpos": 2,

+       "height": 10,

+       "width": 304,

+       "ypos": 562,

+       "type": "match"

+     },

+     {

+       "type": "match",

+       "ypos": 322,

+       "width": 127,

+       "xpos": 55,

+       "height": 13

+     },

+     {

+       "ypos": 417,

+       "width": 119,

+       "type": "match",

+       "xpos": 8,

+       "height": 13

+     },

+     {

+       "xpos": 584,

+       "ypos": 338,

+       "width": 10,

+       "height": 10,

+       "type": "match"

+     }

+   ],

+   "properties": []

+ } 

\ No newline at end of file

empty or binary file added
@@ -0,0 +1,22 @@ 

+ {

+   "properties": [],

+   "tags": [

+     "rescue_mounted"

+   ],

+   "area": [

+     {

+       "xpos": 0,

+       "ypos": 594,

+       "width": 95,

+       "height": 12,

+       "type": "match"

+     },

+     {

+       "xpos": 56,

+       "ypos": 722,

+       "width": 103,

+       "height": 12,

+       "type": "match"

+     }

+   ]

+ } 

\ No newline at end of file

empty or binary file added
@@ -0,0 +1,25 @@ 

+ {

+   "tags": [

+     "ENV-DISTRI-fedora",

+     "ENV-FLAVOR-server",

+     "bootloader",

+     "bootloader_bios"

+   ],

+   "properties": [],

+   "area": [

+     {

+       "xpos": 49,

+       "type": "match",

+       "ypos": 342,

+       "height": 10,

+       "width": 163

+     },

+     {

+       "ypos": 64,

+       "type": "match",

+       "xpos": 54,

+       "width": 54,

+       "height": 30

+     }

+   ]

+ } 

\ No newline at end of file

@@ -0,0 +1,18 @@ 

+ {

+   "tags": [

+     "ENV-DISTRI-fedora",

+     "ENV-FLAVOR-server",

+     "bootloader",

+     "bootloader_bios"

+   ],

+   "properties": [],

+   "area": [

+     {

+       "xpos": 51,

+       "ypos": 343,

+       "width": 513,

+       "height": 10,

+       "type": "match"

+     }

+   ]

+ }

empty or binary file added
file modified
+1536 -7
@@ -1799,6 +1799,1446 @@ 

                                      },

                        test_suite => { name => "install_package_set_kde" },

                      },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-boot-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_default_upload" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 11,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_selinux" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_services_start" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_service_manipulation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_update_cli" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_package_set_minimal" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_anaconda_text" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 31,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_rescue_encrypted" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "support_server" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_nfs_variation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_nfs_graphical" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_role_deploy_domain_controller" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_realmd_join_kickstart" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_cockpit_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_cockpit_basic" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "realmd_join_cockpit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "realmd_join_sssd" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_role_deploy_database_server" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_database_client" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_updates_nfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "support_server" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_http_variation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_http_graphical" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_mirrorlist_graphical" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_user_creation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_scsi_updates_img" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_multi" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_simple_encrypted" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_simple_free_space" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_multi_empty" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_software_raid" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_delete_partial" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_btrfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_ext3" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_xfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_lvmthin" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 50,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_no_swap" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_iscsi" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_ext3" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_btrfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 50,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_no_swap" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_xfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_software_raid" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_lvmthin" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_hdd" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_minimal_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_server_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_2_minimal_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_2_server_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_shrink_ext4" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_shrink_ntfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_european_language" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_cyrillic_language" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_asian_language" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_firewall_disabled" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_firewall_configured" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_nfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64le" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64le",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_firewall_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-boot-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_default_upload" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 11,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_selinux" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_services_start" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_service_manipulation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "base_update_cli" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_package_set_minimal" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_anaconda_text" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 31,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_rescue_encrypted" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "support_server" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_nfs_variation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_nfs_graphical" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_role_deploy_domain_controller" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_realmd_join_kickstart" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_cockpit_default" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_cockpit_basic" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "realmd_join_cockpit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "realmd_join_sssd" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_role_deploy_database_server" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_database_client" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_updates_nfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 10,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "support_server" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_http_variation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_repository_http_graphical" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_mirrorlist_graphical" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_user_creation" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_scsi_updates_img" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_multi" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_simple_encrypted" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_simple_free_space" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_multi_empty" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_software_raid" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_delete_partial" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_btrfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_ext3" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_xfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_lvmthin" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 50,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_no_swap" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_iscsi" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_ext3" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_btrfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 50,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_no_swap" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_xfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_software_raid" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_blivet_lvmthin" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_hdd" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_minimal_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_server_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_2_minimal_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "upgrade_2_server_64bit" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_shrink_ext4" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_shrink_ntfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_european_language" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_cyrillic_language" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 40,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_asian_language" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_firewall_disabled" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_firewall_configured" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 30,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "universal",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "install_kickstart_nfs" },

+                     },

+                     {

+                       group_name => "Fedora PowerPC",

+                       machine    => { name => "ppc64" },

+                       prio       => 20,

+                       product    => {

+                                       arch    => "ppc64",

+                                       distri  => "fedora",

+                                       flavor  => "Server-dvd-iso",

+                                       version => "*",

+                                     },

+                       test_suite => { name => "server_firewall_default" },

+                     },

                    ],

    Machines     => [

                      {
@@ -1842,6 +3282,32 @@ 

                          { key => "WORKER_CLASS", value => "qemu_x86_64" }

                        ],

                      },

+                     {

+                       backend => "qemu",

+                       name => "ppc64le",

+                       settings => [

+                         { key => "QEMU", value => "ppc64" },

+                         { key => "OFW", value => 1 },

+                         { key => "VGA", value => "std" },

+                         { key => "QEMURAM", value => 4096 },

+                         { key => "QEMUCPU", value => "host" },

+                         { key => "WORKER_CLASS", value => "qemu_ppc64le" },

+                         { key => "PART_TABLE_TYPE", value => "mbr"}

+                       ],

+                     },

+                     {

+                       backend => "qemu",

+                       name => "ppc64",

+                       settings => [

+                         { key => "QEMU", value => "ppc64" },

+                         { key => "OFW", value => 1 },

+                         { key => "VGA", value => "std" },

+                         { key => "QEMURAM", value => 4096 },

+                         { key => "QEMUCPU", value => "host" },

+                         { key => "WORKER_CLASS", value => "qemu_ppc64" },

+                         { key => "PART_TABLE_TYPE", value => "mbr"}

+                       ],

+                     },

                    ],

    Products     => [

                      {
@@ -2035,13 +3501,73 @@ 

                                     ],

                        version   => "*",

                      },

+                     {

+                       arch      => "ppc64le",

+                       distri    => "fedora",

+                       flavor    => "universal",

+                       name      => "",

+                       settings  => [

+                           { key => "TEST_TARGET", value => "ISO" }

+                                    ],

+                       version   => "*",

+                     },

+                     {

+                       arch      => "ppc64le",

+                       distri    => "fedora",

+                       flavor    => "Server-dvd-iso",

+                       name      => "",

+                       settings  => [

+                           { key => "TEST_TARGET", value => "ISO" }

+                                    ],

+                       version   => "*",

+                     },

+                     {

+                       arch      => "ppc64le",

+                       distri    => "fedora",

+                       flavor    => "Server-boot-iso",

+                       name      => "",

+                       settings  => [

+                           { key => "TEST_TARGET", value => "ISO" }

+                                    ],

+                       version   => "*",

+                     },

+                     {

+                       arch      => "ppc64",

+                       distri    => "fedora",

+                       flavor    => "universal",

+                       name      => "",

+                       settings  => [

+                           { key => "TEST_TARGET", value => "ISO" }

+                                    ],

+                       version   => "*",

+                     },

+                     {

+                       arch      => "ppc64",

+                       distri    => "fedora",

+                       flavor    => "Server-dvd-iso",

+                       name      => "",

+                       settings  => [

+                           { key => "TEST_TARGET", value => "ISO" }

+                                    ],

+                       version   => "*",

+                     },

+                     {

+                       arch      => "ppc64",

+                       distri    => "fedora",

+                       flavor    => "Server-boot-iso",

+                       name      => "",

+                       settings  => [

+                           { key => "TEST_TARGET", value => "ISO" }

+                                    ],

+                       version   => "*",

+                     },

                    ],

    TestSuites   => [

                      {

                        name => "support_server",

                        settings => [

                          { key => "NUMDISKS", value => "2" },

-                         { key => "HDD_1", value => "disk_f%CURRREL%_support_3_x86_64.img" },

+                         { key => "HDD_1", value => "disk_f%CURRREL%_support_3_%ARCH%.img" },

                          { key => "POSTINSTALL", value => "_support_server" },

                          { key => "USER_LOGIN", value => "false" },

                          { key => "ROOT_PASSWORD", value => "weakpassword" },
@@ -2162,7 +3688,7 @@ 

                      {

                        name => "install_repository_nfs_graphical",

                        settings => [

-                         { key => "REPOSITORY_GRAPHICAL", value => "nfs:10.0.2.110:/repo" },

+                         { key => "REPOSITORY_GRAPHICAL", value => "nfs:nfsvers=4:10.0.2.110:/repo" },

                          { key => "PARALLEL_WITH", value => "support_server" },

                          { key => "INSTALL_UNLOCK", value => "support_ready" },

                          { key => "NICTYPE", value => "tap" },
@@ -2178,7 +3704,7 @@ 

                      {

                        name => "install_repository_nfs_variation",

                        settings => [

-                         { key => "REPOSITORY_VARIATION", value => "nfs:10.0.2.110:/repo" },

+                         { key => "REPOSITORY_VARIATION", value => "nfs:nfsvers=4:10.0.2.110:/repo" },

                          { key => "PARALLEL_WITH", value => "support_server" },

                          { key => "INSTALL_UNLOCK", value => "support_ready" },

                          { key => "NICTYPE", value => "tap" },
@@ -2319,7 +3845,7 @@ 

                          { key => "ROOT_PASSWORD", value => "weakpassword" },

                          { key => "USER_LOGIN", value => "false" },

                          { key => "BOOTFROM", value => "c" },

-                         { key => "HDD_1", value => "disk_f%CURRREL%_minimal_2_x86_64.img" },

+                         { key => "HDD_1", value => "disk_f%CURRREL%_minimal_2_%ARCH%.img" },

                          { key => "UPGRADE", value => "1" },

                          { key => "TEST_TARGET", value => "COMPOSE" },

                        ],
@@ -2344,7 +3870,7 @@ 

                          { key => "USER_LOGIN", value => "test" },

                          { key => "USER_PASSWORD", value => "weakpassword" },

                          { key => "BOOTFROM", value => "c" },

-                         { key => "HDD_1", value => "disk_f%CURRREL%_server_3_x86_64.img" },

+                         { key => "HDD_1", value => "disk_f%CURRREL%_server_3_%ARCH%.img" },

                          { key => "UPGRADE", value => "1" },

                          { key => "TEST_TARGET", value => "COMPOSE" },

                        ],
@@ -2419,7 +3945,7 @@ 

                          { key => "ROOT_PASSWORD", value => "weakpassword" },

                          { key => "USER_LOGIN", value => "false" },

                          { key => "BOOTFROM", value => "c" },

-                         { key => "HDD_1", value => "disk_f%PREVREL%_minimal_2_x86_64.img" },

+                         { key => "HDD_1", value => "disk_f%PREVREL%_minimal_2_%ARCH%.img" },

                          { key => "UPGRADE", value => "1" },

                          { key => "TEST_TARGET", value => "COMPOSE" },

                        ],
@@ -2444,7 +3970,7 @@ 

                          { key => "USER_LOGIN", value => "test" },

                          { key => "USER_PASSWORD", value => "weakpassword" },

                          { key => "BOOTFROM", value => "c" },

-                         { key => "HDD_1", value => "disk_f%PREVREL%_server_3_x86_64.img" },

+                         { key => "HDD_1", value => "disk_f%PREVREL%_server_3_%ARCH%.img" },

                          { key => "UPGRADE", value => "1" },

                          { key => "TEST_TARGET", value => "COMPOSE" },

                        ],
@@ -2538,6 +4064,7 @@ 

                          { key => "ENCRYPT_PASSWORD", value => "weakpassword" },

                          { key => "POSTINSTALL", value => "_console_login" },

                          { key => "REPOSITORY_VARIATION", value => "%LOCATION%" },

+                         { key => "HDDSIZEGB", value => "12" },

                        ],

                      },

                      {
@@ -2552,6 +4079,7 @@ 

                          { key => "ENCRYPT_PASSWORD", value => "weakpassword" },

                          { key => "POSTINSTALL", value => "_console_login" },

                          { key => "REPOSITORY_VARIATION", value => "%LOCATION%" },

+                         { key => "HDDSIZEGB", value => "12" },

                        ],

                      },

                      {
@@ -2566,6 +4094,7 @@ 

                          { key => "ENCRYPT_PASSWORD", value => "weakpassword" },

                          { key => "POSTINSTALL", value => "_console_login" },

                          { key => "REPOSITORY_VARIATION", value => "%LOCATION%" },

+                         { key => "HDDSIZEGB", value => "12" },

                        ],

                      },

                      {

@@ -17,10 +17,17 @@ 

      # check that the repo was used

      $self->root_console;

      if ($repourl =~ s/^nfs://) {

+         $repourl =~ s/^nfsvers=.://;

          # the above both checks if we're dealing with an NFS URL, and

-         # strips the 'nfs:' from it if so

-         # message is in packaging.log up to F26, anaconda.log F27+

-         assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log";

+         # strips the 'nfs:' and 'nfsvers=.:' from it if so

+ 	if (get_var("OFW")) {

+             # for PowerPC mounting info may be not in anaconda.log

+             assert_script_run "mount |grep nfs |grep '${repourl}'";

+ 	}

+ 	else {

+             # message is in packaging.log up to F26, anaconda.log F27+

+             assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log";

+ 	}

      }

      else {

          assert_script_run "grep \"added repo: 'anaconda'.*${repourl}\" /tmp/packaging.log";

file modified
+4 -1
@@ -49,7 +49,9 @@ 

      assert_script_run "firewall-cmd --add-service=nfs";

      # workaround RHBZ #1402427: somehow the file is incorrectly labelled

      # even after a clean install with fixed selinux-policy

-     assert_script_run "restorecon /usr/bin/rpcbind";

+     # Bypass: do not execute restorecon if file do not exist

+     # (for PowerPC rpcbind not in same path)

+     assert_script_run 'for xx in /usr/bin/rpcbind /sbin/rpcbind; do [ -f $xx ] && restorecon $xx; done';

      # start the server

      assert_script_run "systemctl restart nfs-server.service";

      assert_script_run "systemctl is-active nfs-server.service";
@@ -57,6 +59,7 @@ 

      # report ready, wait for children

      mutex_create('support_ready');

      wait_for_children;

+     # TODO we should add systematic data capture to help investigation when children failed.

  }

  

  sub test_flags {

@@ -14,6 +14,9 @@ 

          # if we're running on UEFI, we need esp

          custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');

      }

+     if (get_var("OFW")) {

+         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');

+     }

  

      custom_blivet_add_partition(size => 512, mountpoint => '/boot');

      custom_blivet_add_partition(size => 2048, filesystem => 'swap');

@@ -14,6 +14,9 @@ 

          # if we're running on UEFI, we need esp

          custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');

      }

+     if (get_var("OFW")) {

+         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');

+     }

  

      custom_blivet_add_partition(size => 512, mountpoint => '/boot');

      custom_blivet_add_partition(size => 2048, filesystem => 'swap');

@@ -14,6 +14,9 @@ 

          # if we're running on UEFI, we need esp

          custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');

      }

+     if (get_var("OFW")) {

+         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');

+     }

  

      custom_blivet_add_partition(size => 512, mountpoint => '/boot');

      # add new LVM device

@@ -14,6 +14,9 @@ 

          # if we're running on UEFI, we need esp

          custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');

      }

+     if (get_var("OFW")) {

+         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');

+     }

  

      custom_blivet_add_partition(size => 512, mountpoint => '/boot');

      custom_blivet_add_partition(mountpoint => '/');

@@ -14,6 +14,9 @@ 

          # if we're running on UEFI, we need esp

          custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');

      }

+     if (get_var("OFW")) {

+         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');

+     }

  

      custom_blivet_add_partition(size => 512, mountpoint => '/boot');

      custom_blivet_add_partition(size => 2048, filesystem => 'swap');

@@ -14,6 +14,9 @@ 

          # if we're running on UEFI, we need esp

          custom_blivet_add_partition(size => 512, mountpoint => '/boot/efi', filesystem => 'efi_filesystem');

      }

+     if (get_var("OFW")) {

+         custom_blivet_add_partition(size => 4, filesystem => 'ppc_prep_boot');

+     }

  

      custom_blivet_add_partition(size => 512, mountpoint => '/boot');

      custom_blivet_add_partition(size => 2048, filesystem => 'swap');

@@ -49,8 +49,9 @@ 

      }

      elsif (get_var("REPOSITORY_GRAPHICAL")) {

          $repourl = get_full_repo(get_var("REPOSITORY_GRAPHICAL"));

-         # strip the 'nfs:' for typing here

+         # strip the nfs and nfsvers prefix if present for typing here

          $repourl =~ s/^nfs://;

+         $repourl =~ s/^nfsvers=.://;

          type_safely $repourl;

      }

  

@@ -5,16 +5,24 @@ 

  sub run {

      # handle bootloader screen

      assert_screen "bootloader", 30;

-     # select troubleshooting

-     send_key "down";

-     send_key "ret";

-     # select "rescue system"

-     if (get_var('UEFI')) {

+     if (get_var('OFW')) {

+         # select "rescue system" directly

+         send_key "down";

          send_key "down";

          send_key "ret";

      }

      else {

-         type_string "r\n";

+         # select troubleshooting

+         send_key "down";

+         send_key "ret";

+         # select "rescue system"

+         if (get_var('UEFI')) {

+             send_key "down";

+             send_key "ret";

+         }

+         else {

+             type_string "r\n";

+         }

      }

  

      assert_screen "rescue_select", 120; # it takes time to start anaconda

file modified
+1 -1
@@ -6,7 +6,7 @@ 

  sub run {

      my $self = shift;

      # upgrader should be installed on up-to-date system

-     assert_script_run 'dnf -y update', 1800;

+     assert_script_run 'dnf -y update --refresh', 1800;

      script_run "reboot", 0;

  

      # handle bootloader, if requested

This is a replacement of previous https://phab.qa.fedoraproject.org/D1083

limit the commits to PowerPC required changes, and remove all openQA enhancements about error checking.

  • Add PowerPC support in templates
  • Add "PPC PReP Boot" filesystem for PowerPC blivet tests
  • iscsi backing store not same disk for PowerPC
  • Add a 1s delay between each down key in do_bootloader
  • Add --refresh to force dnf synchronisation
  • support nfsvers=x parameter as nfs option
  • rpcbind not same path for PowerPC
  • Modify "install_multi" test for PowerPC
  • update repo_setup for PowerPC f25
  • Add workstation_selected-20170126 needle for PowerPC
  • First PowerPC specific changes (not templates)

Yeah, Pagure is like Github: you force-push your branch to update PRs.

This whole thing looks messed up - I mean, why define a new arg but then not use it? Why assign the value of $args{disks} to a variable called $second_disk and then never use that variable? It's clearly a mess.

If I'm understanding the intent here correctly, rather than a solution that's very specific to the case of "we want to select exactly the second disk that's connected", I think I'd prefer a more generic approach that can be used for other purposes; perhaps we could look at making disks an array that specifies which disks should be selected, rather than just a count of disks to select which always assumes we'll select disk 1 then disk 2 then disk 3 and so on...

oh, and the needle looks like a dupe; we already have an anaconda_install_destination_select_disk_2 needle. If that needle doesn't match for ppc (perhaps because the disk is sda not vda or something), I'd rather see a variant needle with the same tag, than a new tag.

What's the rationale for reducing these timeouts?

This shouldn't be necessary. Why did you have to add it?

Maybe could just do this unconditionally? It probably doesn't hurt the other arches.

Why not add another screenshot here, just in case we don't have network access?

Is this really needed? We have the French install test running on Rawhide at present and I haven't needed a new needle for it...

So this comment applies to multiple things in this PR, but here seems like a good place to put it: I have a general problem with needles that are only expected to be matched rarely, especially ones with text in them, and that don't cause any obvious consequences if they stop matching.

The main problem is it's very likely that these needles will stop matching and we won't notice; a form of bit-rot. A secondary problem is that updating such needles is a pain, because you need to poke through results until you find a test that should have triggered a match but didn't, or you need to artificially reproduce the failure condition the needle is trying to catch and manually create a new needle, which is time-consuming and tiresome.

So while this kind of thing seems neat, it comes with a considerable maintenance burden I'd really like to avoid in most cases. At the least, I think it'd be good to separate changes like this that aren't strictly related to ppc64 support out from this pull request, so we can get ppc64 support merged first and then consider enhancement requests that aren't directly related to the ppc64 support separately.

This is very likely to be too short a timeout to be safe. I don't mind shortening it, but maybe to 10, not 2.

I'd prefer this be turned into a shared function, if possible, than copy-pasta'd from wherever it is you copy-pasta'd it from (I forget where it is I wrote it :>)

This doesn't seem right...at all. Can you explain a bit more what's going on here?

We haven't tested cloud images in openQA up till now because we have another system, Autocloud, for doing that:

https://apps.fedoraproject.org/autocloud/
https://github.com/kushaldas/autocloud/

It's supposed to be replaced by Taskotron at some point (or at least, that was the plan as last I heard it), but we haven't really envisaged doing Cloud image testing in openQA. It would probably be better to look at adding ppc64 image testing to Autocloud.

why so long? I don't recall this ever timing out. Is this a case where SCALE_TIMEOUT should be used instead?

I refuse to endorse this switch on the grounds that update is clearly a better verb than upgrade for this operation. I don't care what the dnf team says. update 4 life, yo. :P

We intentionally do not do this, and I don't see any reason to do it on some arches but not others. The fact that this fails when packages aren't properly obsoleted is really a feature, not a bug (it helps us catch cases where packages need to be properly obsoleted), and consistent with the test case and the wiki instructions.

If anything, we could add a non-arch'ed refinement here, where if the command fails without --allowerasing we mark it as a soft failure and retry with --allowerasing.

Thanks for all the work on this! Just to confirm something I wrote in-line: I think this will go more smoothly if you separate out things that are kind of non-arch-specific 'enhancements' - particularly all the 'try and catch certain error conditions and tailor log uploading to them' stuff - out from what's strictly needed to enable ppc64 support. I'd like to focus on adding in ppc64 support with the minimum necessary change to achieve that first, then we can look at your other proposed refinements separately without having to rush through them just to get ppc64 support landed.

Thanks again!

rebased

6 years ago

I just refreshed this PR1 with a smaller set of commits as listed here, addressing the main PowerPC specific changes and answering related comments from @adamwill

  • 7a0726d Add PowerPC support in templates
  • 5106d48 Add "PPC PReP Boot" filesystem for PowerPC blivet tests
  • e2996e3 iscsi backing store not same disk for PowerPC
  • 187503d Add a 1s delay between each down key in do_bootloader
  • f065a2a Add --refresh to force dnf synchronisation
  • 548b4a4 support nfsvers=x parameter as nfs option
  • 6787926 rpcbind not same path for PowerPC
  • 28fcc1e Add "install_multi" test for PowerPC
  • 7782445 update repo_setup for PowerPC f25
  • f1a6c79 Add workstation_selected-20170126 needle for PowerPC
  • 830116b First PowerPC specific changes (not templates)

Thanks very much, I'll take a look at this revised version tomorrow morning.

On "Add workstation_selected-20170126 needle for PowerPC" - this isn't actually PowerPC-specific, it seems to be just a bug (probably in GTK+) - when an item in a list like that is selected there's a short transition animation - the dot doesn't just appear fully black, it sort of 'fades in' through a few shades of grey - and it seems like sometimes this transition gets stuck partway through for some reason and the dot stays grey. If you look at other similar needles, we already have a few 'grey' variants of them. The bug report is https://bugzilla.gnome.org/show_bug.cgi?id=771127 .

I don't have a problem with the change - like I said we already have some needles which are basically workarounds for this bug, and adding more is fine.

on "Add "install_multi" test for PowerPC" - first a nitpick, it's more "Adapt" or "Modify", not "Add". More importantly - the change is fairly simple and will work, but it's very special-case-y. I'm not a hard 'no' on it, but I do think we could do better. To elaborate a bit more on my idea - we could turn the $disks arg into an array. The default value of it would be [1], meaning "select disk #1", but you could pass [2] meaning "select only disk #2", [1,2] meaning "select disks #1 and #2", or [2,5,6] meaning "select disks #2, #5 and #6". Obviously an empty array or just any kind of 'false' value would mean "don't select any disks". This is an improvement on the current implementation - where $disks is just a count of disks to be selected, where we always assume we start with disk #1 and don't skip over any - which could be used to address this case and any other similar case that comes up. I haven't looked in detail to make sure this idea can sensibly be combined with all our current usages, but I think there wouldn't be any problems.

Again this probably isn't significant enough to block the merge on, but I do kinda think it'd be nice to do a bit better than a very case-specific 'workaround'.

On "Add a 1s delay between each down key in do_bootloader" - just to be sure, have you checked that this still behaves correctly on the other platforms?

On "Add PowerPC support in templates" - this mostly looks good, but some comments / questions:

  • Personally I'd prefer the group be called "Fedora PowerPC", i.e., capitalize the 'F'. (FWIW I'd already have proposed renaming the 'fedora' group to 'Fedora', except the minor correction isn't really worth the possibility that it might unexpectedly break something).

  • On "increase disk size for asian cyrillic and european tests" - why? (You may have sensed this is a theme with me: I like to understand stuff, preferably via the medium of sixteen-line-long comment blocks :>) I'm not opposed to this if it's necessary, but I'd like to know the reason.

  • "remove hardcoded arch in HDD_1 key using MACHINE variable" - I believe the images in question are really named by arch, not by machine (the x86_64 disk images have, well, x86_64 in their name, not 64bit or uefi). I haven't checked for sure, but I think this change would break those tests on non-PPC arches. Have you checked this? In the existing cases where we use %MACHINE in HDD_1 values, those are tests where the disk image in question is uploaded by another test, which similarly uses %MACHINE in its STORE_HDD_1 value, not tests where the disk image is pre-created by createhdds.

Thanks again for your work on this! I think we're pretty close now :)

On "Add workstation_selected 20170126 needle for PowerPC" - this isn't actually PowerPC-specific, it seems to be just a bug (probably in GTK+) - when an item in a list like that is selected there's a short transition animation - the dot doesn't just appear fully black, it sort of 'fades in' through a few shades of grey - and it seems like sometimes this transition gets stuck partway through for some reason and the dot stays grey. If you look at other similar needles, we already have a few 'grey' variants of them. The bug report is https://bugzilla.gnome.org/show_bug.cgi?id=771127 .
I don't have a problem with the change - like I said we already have some needles which are basically workarounds for this bug, and adding more is fine.

@adamwill

  • Do you want the needle to keep the "Workaround" property, or do you prefer to have it removed ?
  • Do you want the bug ref to be specified in needle file name ? "workstation_selected-bgo771127-greyer.*"

On "Add a 1s delay between each down key in do_bootloader" - just to be sure, have you checked that this still behaves correctly on the other platforms?

No, I did not :)
my guess is that it may slow down marginally.

On "Add PowerPC support in templates" - this mostly looks good, but some comments / questions:

Personally I'd prefer the group be called "Fedora PowerPC", i.e., capitalize the 'F'. (FWIW I'd already have proposed renaming the 'fedora' group to 'Fedora', except the minor correction isn't really worth the possibility that it might unexpectedly break something).

I will do the Capital letter change.

On "increase disk size for asian cyrillic and european tests" - why? (You may have sensed this is a theme with me: I like to understand stuff, preferably via the medium of sixteen-line-long comment blocks :>) I'm not opposed to this if it's necessary, but I'd like to know the reason.

I do not have traces anymore of the previous failures I investigated last january, initially on european and cyrillic tests, and latter on asian test.
Nevertheless if I try manually a clone_job of european test with last Rawhide snapshot 20170807 to decrease from 15 to 10GB then the failure is reported (in french) that Fedora needs 10.03GB (5.95+4.08) but only 10GB available.

"remove hardcoded arch in HDD_1 key using MACHINE variable" - I believe the images in question are really named by arch, not by machine (the x86_64 disk images have, well, x86_64 in their name, not 64bit or uefi). I haven't checked for sure, but I think this change would break those tests on non-PPC arches. Have you checked this? In the existing cases where we use %MACHINE in HDD_1 values, those are tests where the disk image in question is uploaded by another test, which similarly uses %MACHINE in its STORE_HDD_1 value, not tests where the disk image is pre-created by createhdds.

No I did not tested on other archs but ppc64/ppc64le where MACHINE and ARCH are the same.
I will do the change.

Thanks again for your work on this! I think we're pretty close now :)

on "Add "install_multi" test for PowerPC" - first a nitpick, it's more "Adapt" or "Modify", not "Add". More importantly - the change is fairly simple and will work, but it's very special-case-y. I'm not a hard 'no' on it, but I do think we could do better. To elaborate a bit more on my idea - we could turn the $disks arg into an array. The default value of it would be [1], meaning "select disk #1", but you could pass [2] meaning "select only disk #2", [1,2] meaning "select disks #1 and #2", or [2,5,6] meaning "select disks #2, #5 and #6". Obviously an empty array or just any kind of 'false' value would mean "don't select any disks". This is an improvement on the current implementation - where $disks is just a count of disks to be selected, where we always assume we start with disk #1 and don't skip over any - which could be used to address this case and any other similar case that comes up. I haven't looked in detail to make sure this idea can sensibly be combined with all our current usages, but I think there wouldn't be any problems.
Again this probably isn't significant enough to block the merge on, but I do kinda think it'd be nice to do a bit better than a very case-specific 'workaround'.

I will update the related commit header to reference your proposal change for a future commit, but suggest to take the current commit as is for the time being.

11 new commits added

  • Add PowerPC support in templates
  • Add "PPC PReP Boot" filesystem for PowerPC blivet tests
  • iscsi backing store not same disk for PowerPC
  • Add a 1s delay between each down key in do_bootloader
  • Add --refresh to force dnf synchronisation
  • support nfsvers=x parameter as nfs option
  • rpcbind not same path for PowerPC
  • Modify "install_multi" test for PowerPC
  • update repo_setup for PowerPC f25
  • Add workstation_selected-bgo771127 needle not black button
  • First PowerPC specific changes (not templates)
6 years ago

OK, replies in order :)

"Do you want the needle to keep the "Workaround" property, or do you prefer to have it removed ?"

I'd prefer to have it removed - I don't think registering a soft failure when we hit this problem is ultimately very useful.

"Do you want the bug ref to be specified in needle file name ? "workstation_selected-bgo771127-greyer.*""

Yeah, that might be nice - it helps to understand that the needles are for the same purpose.

On the do_bootloader change - okay, I guess I'll just see how that goes in a test run on staging.

"Nevertheless if I try manually a clone_job of european test with last Rawhide snapshot 20170807 to decrease from 15 to 10GB then the failure is reported (in french) that Fedora needs 10.03GB (5.95+4.08) but only 10GB available."

Ah, OK, so it's a really borderline thing. Possibly the 'necessary' packages for ppc are slightly larger than the 'necessary' packages for x86_64 and this is enough to cause this problem? Then increasing the disk size is fine, maybe 11 or 12GB would be better than 15 (we do have some space limitations in the infra deployments).

11 new commits added

  • Add PowerPC support in templates
  • Add "PPC PReP Boot" filesystem for PowerPC blivet tests
  • iscsi backing store not same disk for PowerPC
  • Add a 1s delay between each down key in do_bootloader
  • Add --refresh to force dnf synchronisation
  • support nfsvers=x parameter as nfs option
  • rpcbind not same path for PowerPC
  • Modify "install_multi" test for PowerPC
  • update repo_setup for PowerPC f25
  • Add workstation_selected-bgo771127 needle not black button
  • First PowerPC specific changes (not templates)
6 years ago

OK, replies in order :)
[CUT] ...

Related comments addressed in last commits.
(I reduced size from 15GB to 12GB)

And indeed now I notice we are actually seeing what looks a lot like the same problem with the disk being too small in the current x86_64 Rawhide tests :) So going to 12GiB looks fine.

I think this looks pretty good now, but I want to deploy it to staging and try it out before merging; however, staging is rather busted at present due to some bugs in the new upstream job scheduling code that it's running. I'm trying to sort that out as best I can right now and will do a test run of this stuff ASAP.

@adamwill I have two more commits in https://pagure.io/fork/michelmno/fedora-qa/os-autoinst-distri-fedora/commits/tmp3 (on top of this PR) to address the PowerPC changes for "Fedora Updates"

Do you want to handle that later on on a next PR, or do you prefer to have them pushed in this same PR ?

Separate PR, I think. I'm planning to test this today and merge it soon.

Separate PR, I think. I'm planning to test this today and merge it soon.

new PR https://pagure.io/fedora-qa/os-autoinst-distri-fedora/pull-request/54 created to handle related two new commits.
(Warning the PR#54 short name do not match)

So I'm testing this on staging ATM. Couple of notes so far: the TIMEOUT_SCALE factor is waaay too high, especially given openQA has a hard timeout of 2 hours - any test that takes 2 hours is just killed. With a timeout scale of 4, the timeout for the main installation step is so long that any test which fails there hits the 2 hour timeout, meaning it's killed without the post-failure hook running and we have no chance to work out why it actually failed.

So far I've cut the timeout scale down to 2, but actually so far the tests I've watched run don't seem to run much slower than the x86_64 tests at all; my impression from the initial changes to various timeouts was that tests generally ran slower on PPC, hence the suggestion to use TIMEOUT_SCALE, but if that's not the case, we should probably go back to adjusting individual timeouts, perhaps with an arch-based conditional if it's an operation that for some reason takes much longer on PPC.

Second, I'm running into an issue where taking a snapshot of the VM (which happens in most tests, due to the console and graphical login needles having the milestone flag) is taking an extremely long time for some reason. At least, that's what I think is going on: what happens is the test fails with "DIE ERROR: timeout reading hmp socket" while saving the snapshot (which is done via an hmp request). I don't think it's an issue with the hmp communication, as it also reads some output via hmp at the start of the test (the 'WELCOME' message) and that seems to work fine, so I think it's simply timing out because the snapshot takes longer than it waits. The default wait is 300 seconds, but I've actually kicked it up to 900 and tests are still failing:

https://openqa.stg.fedoraproject.org/tests/146419

did you see anything like that in your trials?

We have two internal openQA instances one with f25, the other one with f26.

  • I experienced rarely the hmp timeout failure on f25 host. But seems to be systematic with f26 host.
  • I did not investigated the problem with f26 yet because able to work on rawhide/f27 tests with the f25 host.
  • I only noticed the differences of os-autoinst and qemu rpm versions between the two releases.
=== abanc (f25):
$rpm -qa |grep -E 'openqa-common|autoinst.4|qemu.system.ppc' |sort
openqa-common-4.4-49.20170409gitfead7af.fc25.noarch
os-autoinst-4.4-12.20170104git84d91e6.fc25.ppc64le
qemu-system-ppc-2.7.1-6.fc25.ppc64le
=== fenix (f26):
$rpm -qa |grep -E 'openqa-common|autoinst-4|qemu.system.ppc' |sort
openqa-common-4.4-49.20170409gitfead7af.fc26.noarch
os-autoinst-4.4-18.20170410git97928a2.fc26.ppc64le
qemu-system-ppc-2.9.0-3.fc26.ppc64le
qemu-system-ppc-core-2.9.0-3.fc26.ppc64le

I don't think it's anything to do with openqa/os-autoinst, because all they do is send a simple HMP command to the guest, and that hasn't changed. I suspect it's much more likely a bug in qemu. Knowing that you've seen a difference between f25 and f26 is very helpful, thanks. I'll talk to our virt team about it.

I've filed https://bugzilla.redhat.com/show_bug.cgi?id=1483765 for the snapshot issue, following up on it there.

So after several days of testing, I think I'm happy with this; staging results for x86_64 seem to be mirroring prod quite closely, so I don't think it breaks the x86_64 tests in any way, and the ppc64 tests seem to be running fine. I think we can go ahead and merge it. But can you please change the timeout scale to 2 (or even drop it entirely), and rebase on current master, so this will apply without a merge commit? Then I will go ahead and merge it. Thanks!

Actually, now I say that, I did just find one thing you broke: the _check_install_source subtest now fails on x86_64, but it passes with current git master. This seems to be down to the nfsvers changes you included, because with git master the test greps for 'mounting 10.0.2.110:/repo', but with your changes it greps for 'mounting nfsvers-4:10.0.2.110:/repo', and that fails. Compare:

Can you please also address that when rebasing? Thanks!

rebased

6 years ago

@adamwill I just did the two related changes in last rebase.

  • removing the TIMEOUT_SCALE for PowerPC machines in templates file, (adding a comment in commit header as a reminder for potential problem)
  • adding the strip I forgot concerning nfsvers in tests/_check_install_source.pm
  • This will probably work for intel machine, BUT need an additionnal patch for PowerPC as mounting info not in anaconda.log (purpose of added commit)

rebased

6 years ago

1 new commit added

  • Change checking nfs mount for PowerPC
6 years ago

Thanks, I'll update staging and see how it runs now, particularly if we get any timeout-related failures.

https://openqa.stg.fedoraproject.org/tests/149384 looks interesting - it seems like with our deployment, at least, vda is the empty disk, even though you found it was vdb for you and tweaked the disk selection code accordingly...any idea what's going on there?

https://openqa.stg.fedoraproject.org/tests/149384 looks interesting - it seems like with our deployment, at least, vda is the empty disk, even though you found it was vdb for you and tweaked the disk selection code accordingly...any idea what's going on there?

I will push a git revert commit, to keep track of the problem,
I verified that in our environment (IBM local openQA instance) we have the same behaviour for f27 and Rawhide as you noticed for Rawhide in openqa.stg when using a f26 host (with qemu 2.9.0-5) while still need original commit when using f25 host (with qemu 2.7.1-6)

1 new commit added

  • Revert "Modify "install_multi" test for PowerPC"
6 years ago

Thanks! I'm at Flock right now and kinda overloaded, but I think this is probably ready for merging now. I'll get to it ASAP.

1 new commit added

  • Revert "iscsi backing store not same disk for PowerPC"
6 years ago

@adamw do you want that I rebase on master ? or do you want before to cherry peek on master the other branch "noprofile-softfail" ?

I'm going to merge that one (since it's fairly critical I don't want to wait for review), just forgot about it...been a busy week. Please rebase after I merge it. I have another thing that needs a PR, but it's less important. Thanks!

rebased

6 years ago

rebased

6 years ago

rebased onto 0683942

6 years ago

@adamw I rebased again this PR on top of master, waiting for your merge.

Thanks, was gonna ask for that - will merge it today.

Pull-Request has been merged by adamwill

6 years ago

OK, so this is merged to master and both prod and stg updated (but of course only stg has any workers at present). Let's keep an eye out for any remaining issues. Thanks again!

Metadata
Changes Summary 25
+17 -5
file changed
lib/utils.pm
+15
file added
needles/anaconda/package_selection/workstation_selected-bgo771127.json
+0
file added
needles/anaconda/package_selection/workstation_selected-bgo771127.png
+15
file added
needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_ppc_prep_boot.json
+0
file added
needles/anaconda/partitioning/blivet/anaconda_blivet_part_fs_ppc_prep_boot.png
+36
file added
needles/anaconda_main_hub_text-20161209.json
+0
file added
needles/anaconda_main_hub_text-20161209.png
+22
file added
needles/console/anaconda-rescue_mounted-ppc.json
+0
file added
needles/console/anaconda-rescue_mounted-ppc.png
+25
file added
needles/console/bootloader_bios_offline_automatic_start-20161108.json
+0
file added
needles/console/bootloader_bios_offline_automatic_start-20161108.png
+18
file added
needles/console/bootloader_bios_offline_ppc.json
+0
file added
needles/console/bootloader_bios_offline_ppc.png
+1536 -7
file changed
templates
+10 -3
file changed
tests/_check_install_source.pm
+4 -1
file changed
tests/_support_server.pm
+3 -0
file changed
tests/disk_custom_blivet_btrfs.pm
+3 -0
file changed
tests/disk_custom_blivet_ext3.pm
+3 -0
file changed
tests/disk_custom_blivet_lvmthin.pm
+3 -0
file changed
tests/disk_custom_blivet_no_swap.pm
+3 -0
file changed
tests/disk_custom_blivet_software_raid.pm
+3 -0
file changed
tests/disk_custom_blivet_xfs.pm
+2 -1
file changed
tests/install_source_graphical.pm
+14 -6
file changed
tests/rescue_mode_encrypted.pm
+1 -1
file changed
tests/upgrade_preinstall.pm