testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix French install test on aarch64 by skipping uefi_postinstall

Browse Source 
The French install/boot test fails on aarch64 due to a bit of an
ordering issue:

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

we run `uefi_postinstall`, which does `loadkeys us`, before we
run `_console_login`, which still expects the French layout, so
it breaks. The safest way to solve this I think is to add a new
variable that lets us skip `uefi_postinstall` - I don't want to
change the ordering so we load `uefi_postinstall` after we read
`POSTINSTALL` in case that breaks things somewhere else.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-11-08 11:21:37 -08:00
parent 13eb4ac2e6
commit 3e6764dbb5
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VARIABLES.md
View File

@ -79,6 +79,7 @@ it also means that `B` conflicts `A` even if not shown in the table).
| `ANACONDA_TEXT` | boolean | `false`/not set | all | when specified, anaconda will run in text mode | | `ANACONDA_TEXT` | boolean | `false`/not set | all | when specified, anaconda will run in text mode |
| `ANACONDA_STATIC` | string (IPv4 address) | not set | `ANACONDA_TEXT` | If set, will set up static networking using the chosen IP address during install | | `ANACONDA_STATIC` | string (IPv4 address) | not set | `ANACONDA_TEXT` | If set, will set up static networking using the chosen IP address during install |
| `POST_STATIC` | string (space-separated IPv4 address and hostname) | not set | nothing | If set, will set up static networking using the chosen IP address and hostname during early post-install | | `POST_STATIC` | string (space-separated IPv4 address and hostname) | not set | nothing | If set, will set up static networking using the chosen IP address and hostname during early post-install |
| `NO_UEFI_POST` | boolean | `false`/not set | nothing | If set, `uefi_postinstall` test will not be loaded even if `UEFI` is set (can be useful for non-English tests to avoid `uefi_postinstall` running loadkeys) |
Run variables Run variables
------------- -------------

2
main.pm
View File

@ -298,7 +298,7 @@ sub load_postinstall_tests() {
} }
autotest::loadtest $storagepost if ($storagepost); autotest::loadtest $storagepost if ($storagepost);
if (get_var("UEFI")) { if (get_var("UEFI") &! get_var("NO_UEFI_POST")) {
autotest::loadtest "tests/uefi_postinstall.pm"; autotest::loadtest "tests/uefi_postinstall.pm";
} }

1
templates
View File

@ -5177,6 +5177,7 @@
{ key => "REPOSITORY_VARIATION", value => "%LOCATION%" }, { key => "REPOSITORY_VARIATION", value => "%LOCATION%" },
{ key => "HDDSIZEGB", value => "13" }, { key => "HDDSIZEGB", value => "13" },
{ key => "QEMU_DISABLE_SNAPSHOTS", value => "1" }, { key => "QEMU_DISABLE_SNAPSHOTS", value => "1" },
{ key => "NO_UEFI_POST", value => "1" },
], ],
}, },
{ {