Merge branch 'rocky-linux:develop' into fix-install-languages

This commit is contained in:
Lukas Magauer 2021-08-25 14:32:55 +02:00 committed by GitHub
commit 0dd4543a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 287 additions and 6 deletions

View File

@ -0,0 +1,28 @@
---
name: openQA test suite and/or needle update
about: Report openQA test failure and/or needle update requirement
title: [Test Suite Failure] for [insert_test_suite_name_here] on [DISTRI-VERSION-FLAVOR-ARCH]
labels: [test suite]
assignees: ''
---
## Describe Issue
Please describe the issue as completely as possible so that an appropriate fix may be developed.
| Test Suite | <!-- eg: `install_default@uefi` --> |
|-------------------|-------------------------------------|
| Result | <!-- eg: **failed** ( 04:46 minutes ) --> |
| Scheduled product | <!-- eg: `rocky-8.4-dvd-iso-x86_64` --> |
| Test module | <!-- eg: `/var/lib/openqa/share/tests/rocky/tests/_impacted_test_module_here.pm` --> |
| Analysis | <!-- eg: *Analysis Test died: no candidate needle with tag(s) 'anaconda_help_progress_link' matched* --> |
<!-- Provide any additional relevant detail here -->
## Planned Action
<!-- Outline the steps that should be taken to address this issue -->
## Special Notes
<!-- Please provide any special instructions/information that may help testing progress more quickly -->
<!-- For example... Test can run from `disk_64bit_cockpit.qcow2` image if it is saved and stored appropriately in the test system. There is no need to run from beginning and/or trigger from `install_default_upload@64bit`. -->

View File

@ -0,0 +1,33 @@
---
name: openQA test suite and/or needle Pull Request
about: Submit openQA test fix and/or needle updates
title: Test Suite: [insert_test_suite_name_here] on [DISTRI-VERSION-FLAVOR-ARCH]
labels: 'test suite'
assignees: ''
---
# Description
<!-- Provide a brief description of the pull request here -->
<!-- If applicable, specify the issue number this PR fixes -->
<!-- eg: Fixes #999 -->
<!-- If no Issue exists it is highly recommended that you create an issue first, assigning it to yourself and then return here to provide the pull request. -->
# How Has This Been Tested?
<!-- Indicate what you have done to test this PR, with screenshots if appropriate -->
<!-- At a minimum, please include the following: -->
<!-- * The command you used to trigger a passing test -->
<!-- * Criteria for a successful test (eg: suite install_minimal@uefi passes) -->
# Checklist:
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] Any dependent changes have been merged and published in downstream modules

View File

@ -306,7 +306,7 @@ sub get_full_repo {
} }
sub get_mirrorlist_url { sub get_mirrorlist_url {
return "mirrors.fedoraproject.org/mirrorlist?repo=fedora-" . lc(get_var("VERSION")) . "&arch=" . get_var('ARCH'); return "mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-" . lc(get_var("VERSION")) . "&arch=" . get_var('ARCH');
} }
sub check_help_on_pane { sub check_help_on_pane {

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 17,
"height": 21,
"width": 125,
"type": "match",
"ypos": 549
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-english",
"anaconda_install_destination_encrypt_data"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 26,
"xpos": 672,
"width": 130,
"type": "match",
"ypos": 506
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-english",
"anaconda_install_destination_save_passphrase"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"type": "match",
"ypos": 283,
"height": 24,
"xpos": 39,
"width": 17
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"anaconda_install_destination_select_disk_1"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"width": 18,
"xpos": 201,
"height": 23,
"ypos": 284,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"anaconda_install_destination_select_disk_2"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"width": 105,
"xpos": 56,
"height": 19,
"ypos": 210,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"anaconda_install_source_selected"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"width": 100,
"xpos": 58,
"height": 15,
"ypos": 179,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"LANGUAGE-english",
"anaconda_install_source_on_the_network"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 198,
"type": "match",
"width": 33,
"height": 38,
"xpos": 722
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_main_hub_install_destination"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"ypos": 270,
"type": "match",
"width": 119,
"xpos": 500,
"height": 49
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"LANGUAGE-english",
"anaconda_part_device_type"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 325,
"type": "match",
"width": 68,
"height": 23,
"xpos": 505
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"anaconda_part_device_type_raid"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -0,0 +1,18 @@
{
"area": [
{
"type": "match",
"ypos": 269,
"xpos": 64,
"height": 20,
"width": 140
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"LANGUAGE-english",
"anaconda_part_scheme_lvmthin"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"ypos": 136,
"type": "match",
"width": 79,
"height": 16,
"xpos": 42
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-FLAVOR-server",
"anaconda_part_select_root"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"type": "match",
"ypos": 527,
"xpos": 263,
"height": 16,
"width": 59
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_services_detail"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 251,
"ypos": 521,
"width": 58,
"height": 22,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_services_entry"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -4,13 +4,15 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
my $count = 3; my $count = 4;
my $devroot = 'vda1'; my $devroot = 'vda1';
my $devboot = 'vda2'; my $devboot = 'vda2';
my $devswap = 'vda3';
if (get_var('OFW') || get_var('UEFI')) { if (get_var('OFW') || get_var('UEFI')) {
$count = 4; # extra boot partition (PreP or ESP) $count = 5; # extra boot partition (PreP or ESP)
$devroot = 'vda2'; $devroot = 'vda2';
$devboot = 'vda3'; $devboot = 'vda3';
$devswap = 'vda4';
} }
# check number of partitions # check number of partitions
script_run 'fdisk -l | grep /dev/vda'; # debug script_run 'fdisk -l | grep /dev/vda'; # debug
@ -19,6 +21,7 @@ sub run {
script_run 'mount | grep /dev/vda'; # debug 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/$devboot", sub { $_ =~ m/on \/boot type ext4/ };
validate_script_output "mount | grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ }; validate_script_output "mount | grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ };
validate_script_output "swapon --show | grep /dev/$devswap", sub { $_ =~ m/ partition / };
} }
sub test_flags { sub test_flags {

View File

@ -49,9 +49,6 @@ sub run {
send_key "tab"; send_key "tab";
send_key "tab"; send_key "tab";
send_key "down"; send_key "down";
# since anaconda-33.17-1.fc33 we only have to press down *one*
# time to select 'mirrorlist'
send_key "down" if ($relnum < 33);
} }
elsif (get_var("REPOSITORY_GRAPHICAL")) { elsif (get_var("REPOSITORY_GRAPHICAL")) {
$repourl = get_full_repo(get_var("REPOSITORY_GRAPHICAL")); $repourl = get_full_repo(get_var("REPOSITORY_GRAPHICAL"));