PR#210: two ppc64le commits for two new tests - fedora-qa/os-autoinst-distri-fedora

fedora-qa / os-autoinst-distri-fedora

#210 two ppc64le commits for two new tests

Merged 3 years ago by adamwill. Opened 3 years ago by michelmno.

fedora-qa/ michelmno/os-autoinst-distri-fedora two_ppc64le_changes into master

Avoid ppc64le failure for new ext4 install test

Michel Normand • 3 years ago

8165473

Use $serialdev in desktop_terminal.pm not ttyS0

Michel Normand • 3 years ago

cc9be97

tests/desktop_terminal.pm

file modified

+1 -1

		`@@ -19,7 +19,7 @@`
		`# if we can run something successfully, we're at a console;`
		`# we're reinventing assert_script_run instead of using it so`
		`# we can type safely`
		`- type_very_safely "ls && echo 'ls OK' > /dev/ttyS0\n";`
		`+ type_very_safely "ls && echo 'ls OK' > /dev/${serialdev}\n";`
		`die "terminal command failed" unless defined wait_serial "ls OK";`
		`}`

tests/disk_custom_standard_partition_ext4_postinstall.pm

file modified

+15 -6

		`@@ -4,12 +4,21 @@`

		`sub run {`
		`assert_screen "root_console";`
		`- # check that there are two partitions`
		`- validate_script_output 'fdisk -l \| grep /dev/vda \| wc -l', sub { $_ =~ m/3/ };`
		`- # check that vda2 is a boot partition and that the fs is ext4`
		`- validate_script_output 'mount \| grep /dev/vda2', sub { $_ =~ m/on \/boot type ext4/ };`
		`- # check that vda1 is a root partition and that the fs is ext4`
		`- validate_script_output 'mount \| grep /dev/vda1', sub { $_ =~ m/on \/ type ext4/ };`
		`+ my $count = 3;`
		`+ my $devroot = 'vda1';`
		`+ my $devboot = 'vda2';`
		`+ if (get_var('OFW')) {`
		`+ $count = 4; # for PowerPC there is also a PreP partition.`
		`+ $devroot = 'vda2';`
		`+ $devboot = 'vda3';`
		`+ }`
		`+ # check number of partitions`
		`+ script_run 'fdisk -l \| grep /dev/vda'; # debug`
		`+ validate_script_output 'fdisk -l \| grep /dev/vda \| wc -l', sub { $_ =~ m/$count/ };`
		`+ # check mounted partitions are ext4 fs`
		`+ script_run 'mount \| grep /dev/vda'; # debug`
		`+ validate_script_output "mount \| grep /dev/$devboot", sub { $_ =~ m/on \/boot type ext4/ };`
		`+ validate_script_output "mount \| grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ };`
		`}`

		`sub test_flags {`

michelmno commented 3 years ago

required as corrections for:

fedora-Rawhide-Server-dvd-iso-ppc64le-BuildFedora-Rawhide-20201202.n.0-install_standard_partition_ext4
https://openqa.stg.fedoraproject.org/tests/976788#step/disk_custom_standard_partition_ext4_postinstall/4

fedora-Rawhide-Workstation-live-iso-ppc64le-BuildFedora-Rawhide-20201202.n.0-desktop_terminal@ppc64le
https://openqa.stg.fedoraproject.org/tests/976770#step/desktop_terminal/3

2 new commits added

Avoid ppc64le failure for new ext4 install test
Use $serialdev in desktop_terminal.pm not ttyS0

3 years ago

zuul commented 3 years ago

Build succeeded.

os-autoinst-tox : SUCCESS in 3m 47s
os-autoinst-perl : SUCCESS in 4m 30s

zuul commented 3 years ago

Build succeeded.

os-autoinst-tox : SUCCESS in 4m 08s
os-autoinst-perl : SUCCESS in 5m 10s

adamwill commented 3 years ago

Looks good. Sorry, we should've tested @lruzicka 's PR on all arches, it's nearly the end of the year so I'm getting lazy :D @lruzicka please remember to check all arches for future PRs if possible.