Merge pull request #137 from rocky-linux/8.7-release

Updates for 8.7 release
This commit is contained in:
Lukas Magauer 2022-12-09 01:32:44 +01:00 committed by GitHub
commit 08bc6adf81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 484 additions and 124 deletions

View File

@ -39,9 +39,16 @@ sub start_cockpit {
sub select_cockpit_update {
# This method navigates to to the updates screen
assert_screen ["cockpit_software_updates", "cockpit_leftbar_scroll"], 120;
# From Firefox 100 on, we get 'adaptive scrollbars', which means
# the scrollbar is just invisible unless you moved the mouse
# recently. So we click in the search box and hit 'down' to scroll
# the sidebar as often as needed to show the button
assert_screen ["cockpit_software_updates", "cockpit_search"], 120;
click_lastmatch;
assert_and_click "cockpit_software_updates" if (match_has_tag "cockpit_leftbar_scroll");
if (match_has_tag "cockpit_search") {
send_key_until_needlematch("cockpit_software_updates", "down", 10);
assert_and_click "cockpit_software_updates";
}
# wait for the updates to download
assert_screen 'cockpit_updates_check', 300;
}

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 2,
"height": 764,
"type": "match",
"width": 144,
"xpos": 3
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"leftbar_generic"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"ypos": 24,
"xpos": 171,
"width": 683,
"height": 32,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-russian",
"topbar_generic"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@ -0,0 +1,24 @@
{
"area": [
{
"width": 305,
"type": "match",
"xpos": 716,
"ypos": 634,
"height": 14
},
{
"xpos": 873,
"type": "match",
"width": 105,
"height": 14,
"ypos": 698
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-japanese",
"anaconda_install_done"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 261,
"ypos": 524,
"width": 105,
"height": 11,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-arabic",
"anaconda_rawhide_accept_fate"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 649,
"ypos": 585,
"width": 110,
"height": 15,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-french",
"anaconda_rawhide_accept_fate"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 697,
"ypos": 622,
"width": 54,
"height": 13,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-japanese",
"anaconda_rawhide_accept_fate"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

View File

@ -1,11 +1,11 @@
{
"area": [
{
"ypos": 705,
"height": 19,
"xpos": 674,
"type": "match",
"width": 343
"ypos": 594,
"xpos": 647,
"width": 124,
"height": 19
}
],
"properties": [],

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"xpos": 700,
"ypos": 522,
"width": 81,
"height": 15,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-russian",
"anaconda_rawhide_accept_fate"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"height": 55,
"type": "match",
"width": 43,
"xpos": 196,
"ypos": 711
}
],
"properties": [],
"tags": [
"cockpit_leftbar_scroll"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"width": 48,
"xpos": 922,
"type": "match",
"ypos": 508,
"height": 19
}
],
"properties": [],
"tags": [
"cockpit_updates_auto"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"ypos": 694,
"width": 43,
"height": 55,
"xpos": 196,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_leftbar_scroll"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"height": 77,
"width": 232,
"ypos": 200,
"xpos": 572,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 221,
"xpos": 572,
"type": "match",
"height": 77,
"width": 232
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 205,
"height": 77,
"type": "match",
"xpos": 572,
"width": 232
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_login"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"xpos": 21,
"ypos": 207,
"width": 174,
"height": 27,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_search"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"width": 174,
"type": "match",
"xpos": 29,
"height": 27,
"ypos": 205
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_search"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"height": 22,
"width": 62,
"ypos": 689,
"xpos": 83,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_software_updates"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

View File

@ -1,34 +0,0 @@
{
"area": [
{
"width": 53,
"height": 22,
"click_point": {
"xpos": 24.5,
"ypos": 11.5
},
"type": "match",
"xpos": 909,
"ypos": 447
},
{
"xpos": 262,
"ypos": 448,
"width": 145,
"height": 20,
"type": "match"
},
{
"xpos": 408,
"ypos": 448,
"width": 75,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_auto"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"xpos": 264,
"ypos": 447,
"width": 716,
"height": 21,
"type": "match",
"click_point": {
"xpos": 681,
"ypos": 11.5
}
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_auto"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,20 @@
{
"area": [
{
"ypos": 447,
"click_point": {
"xpos": 681,
"ypos": 11.5
},
"height": 21,
"width": 716,
"xpos": 264,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"cockpit_updates_auto"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,16 @@
{
"area": [
{
"width": 110,
"height": 23,
"type": "match",
"xpos": 607,
"ypos": 196
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"firefox_close_tabs"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"ypos": 39,
"height": 24,
"width": 49,
"xpos": 14,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"LANGUAGE-arabic",
"skip_button"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -1,36 +0,0 @@
#!/bin/bash
set -e
ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
ROCKY_VERSION="${ROCKY_VERSION:-8.6}"
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_PACKAGE_SET="${ROCKY_PACKAGE_SET:=minimal}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="${ROCKY_VERSION}_${ROCKY_FLAVOR}"
BUILD_NAME="${BUILD_PREFIX}_$(date +%Y%m%d.%H%M%S).0"
if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
ISO_TYPE=dvd1
elif [[ "$ROCKY_FLAVOR" == "minimal-iso" ]]; then
ISO_TYPE=minimal
elif [[ "$ROCKY_FLAVOR" == "boot-iso" ]]; then
ISO_TYPE=boot
else
echo "Usage: $0 [universal|dvd-iso|minimal-iso|boot-iso]"
exit 1
fi
export PS4='# '
set -o xtrace
openqa-cli api \
-X POST isos \
ISO="Rocky-$ROCKY_VERSION-$ROCKY_ARCH-$ISO_TYPE.iso" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR="$ROCKY_FLAVOR" \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_NAME" \
PACKAGE_SET="$ROCKY_PACKAGE_SET" \
IDENTIFICATION=false \
"${ROCKY_EXTRA_ARGS}"

13
scripts/cancel-build.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
BUILD="$1"
## Usage: Cancels all outstanding openQA jobs for the specified build
# scripts/cancel-build.sh 20221014.133700-My-Named-Build
jobs_in_build=$(openqa-cli api jobs build="$BUILD" | jq -r '.jobs[].id' | xargs)
for id in $jobs_in_build
do
openqa-cli api -X POST "jobs/$id/cancel"
done

75
scripts/run-all-flavors.sh Executable file
View File

@ -0,0 +1,75 @@
#!/bin/bash
set -e
MAJOR_VERSION=9
MINOR_VERSION=0
## Usage: Posts ISOs to openQA for each of the universal, dvd-iso, package-set, minimal-iso, and boot-iso FLAVORs.
# scripts/run-all-flavors.sh
ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
DVD_ISOTYPE=dvd1
if [[ "$MAJOR_VERSION" -gt "8" ]]; then
DVD_ISOTYPE=dvd
fi
# Update fif templates
./fifloader.py --clean --load templates.fif.json templates-updates.fif.json
# POST all the flavors
export PS4='# '
set -o xtrace
openqa-cli api \
-X POST isos \
ISO="$ISO_PREFIX-$DVD_ISOTYPE.iso" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR=universal \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-universal-$ROCKY_VERSION" \
"${ROCKY_EXTRA_ARGS}"
openqa-cli api \
-X POST isos \
ISO="$ISO_PREFIX-$DVD_ISOTYPE.iso" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR="dvd-iso" \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-dvd-$ROCKY_VERSION" \
"${ROCKY_EXTRA_ARGS}"
openqa-cli api \
-X POST isos \
ISO="$ISO_PREFIX-$DVD_ISOTYPE.iso" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR=package-set \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-packageset-$ROCKY_VERSION" \
"${ROCKY_EXTRA_ARGS}"
openqa-cli api \
-X POST isos \
ISO="$ISO_PREFIX-minimal.iso" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR=minimal-iso \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-minimal-$ROCKY_VERSION" \
"${ROCKY_EXTRA_ARGS}"
openqa-cli api \
-X POST isos \
ISO="$ISO_PREFIX-boot.iso" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR=boot-iso \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_PREFIX-boot-$ROCKY_VERSION" \
"${ROCKY_EXTRA_ARGS}"

59
scripts/run-openqa-tests.sh Executable file
View File

@ -0,0 +1,59 @@
#!/bin/bash
set -e
MAJOR_VERSION=9
MINOR_VERSION=0
## Usage: Post an ISO for the specified FLAVOR. Defaults to boot-iso.
#
## Run the boot-iso FLAVOR
# scripts/run-openqa-tests.sh
#
## Run the package-set FLAVOR
# ROCKY_FLAVOR=package-set scripts/run-openqa-tests.sh
#
## Run the localization test suites
# ROCKY_FLAVOR ROCKY_EXTRA_ARGS=TEST=install_arabic_language,install_asian_language,install_european_language,install_cyrillic_language scripts/run-openqa-tests.sh
ROCKY_FLAVOR="${ROCKY_FLAVOR:-boot-iso}"
ROCKY_VERSION="$MAJOR_VERSION.$MINOR_VERSION"
ROCKY_ARCH="${ROCKY_ARCH:=x86_64}"
ROCKY_EXTRA_ARGS="${ROCKY_EXTRA_ARGS:-}"
BUILD_PREFIX="-$(date +%Y%m%d.%H%M%S).0-$(git branch --show-current)"
BUILD_NAME="$BUILD_PREFIX-$ROCKY_FLAVOR-$ROCKY_VERSION"
ISO_PREFIX="Rocky-$ROCKY_VERSION-$ROCKY_ARCH"
if [[ "$ROCKY_FLAVOR" == "dvd-iso" || "$ROCKY_FLAVOR" == "universal" ]]; then
if [[ "$MAJOR_VERSION" -gt "8" ]]; then
ISO_TYPE=dvd
else
ISO_TYPE=dvd1
fi
elif [[ "$ROCKY_FLAVOR" == "minimal-iso" ]]; then
ISO_TYPE=minimal
elif [[ "$ROCKY_FLAVOR" == "boot-iso" || "$ROCKY_FLAVOR" == "package-set" ]]; then
# package-set also works with dvd image
ISO_TYPE=boot
else
echo "Usage: $0 [universal|dvd-iso|minimal-iso|package-set|boot-iso]"
exit 1
fi
ROCKY_ISO="$ISO_PREFIX-$ISO_TYPE.iso"
# Update fif templates
./fifloader.py --clean --load templates.fif.json templates-updates.fif.json
# Run the tests
export PS4='# '
set -o xtrace
openqa-cli api \
-X POST isos \
ISO="$ROCKY_ISO" \
ARCH="$ROCKY_ARCH" \
DISTRI=rocky \
FLAVOR="$ROCKY_FLAVOR" \
VERSION="$ROCKY_VERSION" \
BUILD="$BUILD_NAME" \
"$ROCKY_EXTRA_ARGS"

View File

@ -237,6 +237,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_reboot_unmount",
"ROOT_PASSWORD": "weakpassword",
@ -251,6 +252,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_system_logging",
"ROOT_PASSWORD": "weakpassword",
@ -265,6 +267,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_update_cli",
"ROOT_PASSWORD": "weakpassword",
@ -279,6 +282,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_package_install_remove",
"ROOT_PASSWORD": "weakpassword",
@ -293,6 +297,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_services_start",
"ROOT_PASSWORD": "weakpassword",
@ -307,6 +312,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_selinux",
"ROOT_PASSWORD": "weakpassword",
@ -321,6 +327,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "base_service_manipulation",
"ROOT_PASSWORD": "weakpassword",
@ -591,6 +598,7 @@
"rocky-dvd-iso-x86_64-*-uefi": 31
},
"settings": {
"DESKTOP": "gnome",
"PARTITIONING": "custom_standard_partition_ext4",
"ROOT_PASSWORD": "weakpassword"
}
@ -882,6 +890,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "modularity_module_list modularity_enable_disable_module modularity_install_module",
"ROOT_PASSWORD": "weakpassword",
@ -923,6 +932,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "_setup_browser server_cockpit_default",
"ROOT_PASSWORD": "weakpassword",
@ -952,6 +962,7 @@
},
"settings": {
"BOOTFROM": "c",
"DESKTOP": "gnome",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"POSTINSTALL": "server_filesystem_default",
"ROOT_PASSWORD": "weakpassword",

View File

@ -42,7 +42,7 @@ sub run {
unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
# in 9.0, license screens are not shown by default
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/9.0_release_notes/index#enhancement_installer-and-image-creation
unless ($version eq '9.0') {
unless (get_version_major() > 8) {
# for Rocky Linux here happens to be a license acceptance screen
# the initial appearance can sometimes take really long
assert_screen "gdm_initial_setup_license", 120;