1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-02-26 17:04:32 +00:00

Compare commits

..

No commits in common. "5698525cc7c4abe1dc2464f487fa57f8fadbc1c2" and "5af70b9dda17f1948b75e3f8c91dac1988ea1345" have entirely different histories.

11 changed files with 25 additions and 51 deletions

View File

@ -556,7 +556,6 @@ sub _repo_setup_updates {
return if (get_var("_ADVISORY_REPO_DONE")); return if (get_var("_ADVISORY_REPO_DONE"));
my $version = get_var("VERSION"); my $version = get_var("VERSION");
my $currrel = get_var("CURRREL", "0"); my $currrel = get_var("CURRREL", "0");
my $arch = get_var("ARCH");
# this can be used for debugging repo config if something is wrong # this can be used for debugging repo config if something is wrong
# unless (script_run 'pushd /etc/yum.repos.d && tar czvf yumreposd.tar.gz * && popd') { # unless (script_run 'pushd /etc/yum.repos.d && tar czvf yumreposd.tar.gz * && popd') {
# upload_logs "/etc/yum.repos.d/yumreposd.tar.gz"; # upload_logs "/etc/yum.repos.d/yumreposd.tar.gz";
@ -591,11 +590,6 @@ sub _repo_setup_updates {
repos_mirrorlist(); repos_mirrorlist();
# Disable updates-testing so other bad updates don't break us # Disable updates-testing so other bad updates don't break us
disable_updates_repos(both => 0) if ($version > $currrel); disable_updates_repos(both => 0) if ($version > $currrel);
# use the buildroot repo on Rawhide: see e.g.
# https://pagure.io/fedora-ci/general/issue/376 for why
if (get_var("VERSION") eq get_var("RAWREL")) {
assert_script_run 'printf "[koji-rawhide]\nname=koji-rawhide\nbaseurl=https://kojipkgs.fedoraproject.org/repos/rawhide/latest/' . $arch . '/\ncost=2000\nenabled=1\ngpgcheck=0\n" > /etc/yum.repos.d/koji-rawhide.repo';
}
# set up the workaround repo # set up the workaround repo
setup_workaround_repo; setup_workaround_repo;
if (get_var("CANNED")) { if (get_var("CANNED")) {
@ -628,7 +622,7 @@ sub _repo_setup_updates {
my $kojitime = 600; my $kojitime = 600;
# texlive has a ridiculous number of subpackages # texlive has a ridiculous number of subpackages
$kojitime = 1500 if ((rindex $nvr, "texlive", 0) == 0); $kojitime = 1500 if ((rindex $nvr, "texlive", 0) == 0);
if (script_run "koji download-build --arch=$arch --arch=noarch $nvr 2> download.log", $kojitime) { if (script_run "koji download-build --arch=" . get_var("ARCH") . " --arch=noarch $nvr 2> download.log", $kojitime) {
# if the error was because the build has no packages # if the error was because the build has no packages
# for our arch, that's okay, skip it. otherwise, die # for our arch, that's okay, skip it. otherwise, die
if (script_run "grep 'No .*available for $nvr' download.log") { if (script_run "grep 'No .*available for $nvr' download.log") {
@ -639,7 +633,7 @@ sub _repo_setup_updates {
} }
elsif (get_var("KOJITASK")) { elsif (get_var("KOJITASK")) {
# Koji task case (KOJITASK will be set) # Koji task case (KOJITASK will be set)
assert_script_run "koji download-task --arch=$arch --arch=noarch " . get_var("KOJITASK"), 600; assert_script_run "koji download-task --arch=" . get_var("ARCH") . " --arch=noarch " . get_var("KOJITASK"), 600;
} }
else { else {
die "Neither ADVISORY_NVRS nor KOJITASK set! Don't know what to do"; die "Neither ADVISORY_NVRS nor KOJITASK set! Don't know what to do";

View File

@ -246,7 +246,6 @@ sub _load_early_postinstall_tests {
# Appropriate login method for install type # Appropriate login method for install type
if (get_var("DESKTOP")) { if (get_var("DESKTOP")) {
_load_instance("tests/_graphical_wait_login", $instance); _load_instance("tests/_graphical_wait_login", $instance);
_load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
} }
# Test non-US input at this point, on language tests # Test non-US input at this point, on language tests
if (get_var("SWITCHED_LAYOUT") || get_var("INPUT_METHOD")) { if (get_var("SWITCHED_LAYOUT") || get_var("INPUT_METHOD")) {
@ -262,7 +261,6 @@ sub _load_early_postinstall_tests {
# the installation is interrupted on purpose. # the installation is interrupted on purpose.
unless (get_var("DESKTOP") || get_var("CRASH_REPORT")) { unless (get_var("DESKTOP") || get_var("CRASH_REPORT")) {
_load_instance("tests/_console_wait_login", $instance); _load_instance("tests/_console_wait_login", $instance);
_load_instance("tests/_snapshot_only") if (get_var("LOGIN_SNAPSHOT"));
} }
} }

View File

@ -1,20 +0,0 @@
{
"area": [
{
"xpos": 364,
"type": "match",
"width": 88,
"height": 15,
"ypos": 232
}
],
"properties": [
{
"value": "workaround for bug 2060540 (window is too large for screen). this needle version is for when there *is* a crash",
"name": "workaround"
}
],
"tags": [
"abrt_runs"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,20 @@
{
"properties": [
{
"name": "workaround",
"value": "Abrt reported issues"
}
],
"tags": [
"abrt_runs",
],
"area": [
{
"xpos": 394,
"ypos": 231,
"width": 63,
"height": 17,
"type": "match"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

View File

@ -2237,7 +2237,6 @@
"settings": { "settings": {
"BOOTFROM": "c", "BOOTFROM": "c",
"HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
"LOGIN_SNAPSHOT": "1",
"POSTINSTALL": "modularity_module_list modularity_enable_disable_module modularity_install_module", "POSTINSTALL": "modularity_module_list modularity_enable_disable_module modularity_install_module",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
@ -2386,7 +2385,6 @@
"+HDD_1": "disk_%MACHINE%_cockpit.qcow2", "+HDD_1": "disk_%MACHINE%_cockpit.qcow2",
"+START_AFTER_TEST": "server_cockpit_default", "+START_AFTER_TEST": "server_cockpit_default",
"BOOTFROM": "c", "BOOTFROM": "c",
"LOGIN_SNAPSHOT": "1",
"POSTINSTALL": "server_cockpit_updates server_cockpit_autoupdate", "POSTINSTALL": "server_cockpit_updates server_cockpit_autoupdate",
"ROOT_PASSWORD": "weakpassword", "ROOT_PASSWORD": "weakpassword",
"USER_LOGIN": "false" "USER_LOGIN": "false"

View File

@ -32,7 +32,7 @@ sub run {
} }
sub test_flags { sub test_flags {
return {fatal => 1}; return {};
} }
1; 1;

View File

@ -37,7 +37,7 @@ sub run {
} }
sub test_flags { sub test_flags {
return {fatal => 1}; return {fatal => 1, milestone => 1};
} }
1; 1;

View File

@ -121,7 +121,7 @@ sub run {
} }
sub test_flags { sub test_flags {
return {fatal => 1}; return {fatal => 1, milestone => 1};
} }
1; 1;

View File

@ -1,16 +0,0 @@
use base "installedtest";
use strict;
use testapi;
use utils;
sub run {
my $self = shift;
}
sub test_flags {
return {fatal => 1, milestone => 1};
}
1;
# vim: set sw=4 et: