task: merge develop to main #183

Merged
tcooper merged 8 commits from develop into main 2023-06-07 16:11:21 +00:00
7 changed files with 65 additions and 2 deletions

View File

@ -0,0 +1,16 @@
{
"area": [
{
"ypos": 475,
"xpos": 529,
"width": 40,
"height": 21,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"autoupdate_planned_time"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"height": 28,
"type": "match",
"ypos": 585,
"xpos": 264,
"width": 133
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"cockpit_services_detail"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

View File

@ -0,0 +1,17 @@
{
"area": [
{
"ypos": 362,
"width": 39,
"xpos": 14,
"height": 18,
"type": "match"
}
],
"properties": [],
"tags": [
"ENV-DISTRI-rocky",
"ENV-LANGUAGE-english",
"cockpit_logs"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -2,24 +2,37 @@ use base "installedtest";
use strict;
use testapi;
use packagetest;
use utils;
sub run {
my $self = shift;
# switch to TTY3 for both, graphical and console tests
$self->root_console(tty => 3);
# enable test repos and install test packages
prepare_test_packages;
# check rpm agrees they installed good
verify_installed_packages;
if (get_var("DISTRI") eq "rocky") {
# pandoc-common is in PowerTools in RockyLinux
if (get_version_major() < 9) {
# pandoc-common is in PowerTools in Rocky Linux 8
assert_script_run 'dnf config-manager --set-enabled powertools', 60;
}
else {
# pandoc-common is in CRB in Rocky Linux 8
assert_script_run 'dnf config-manager --set-enabled crb', 60;
}
}
# update the fake pandoc-common (should come from the real repo)
# this can take a long time if we get unlucky with the metadata refresh
assert_script_run 'dnf -y --disablerepo=openqa-testrepo* --disablerepo=updates-testing update pandoc-common', 600;
# check we got the updated version
verify_updated_packages;
# now remove pandoc-common, and see if we can do a straight
# install from the default repos
assert_script_run 'dnf -y remove pandoc-common';