srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

changes in install source test

This commit is contained in:
Garret Raziel 2015-02-19 16:55:29 +01:00 committed by root
parent 20504fa965
commit b3e118fe79
4 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/anacondalog.pm
View File

@ -16,7 +16,13 @@ sub post_fail_hook {
# Upload all ABRT logs # Upload all ABRT logs
type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *"; type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *";
send_key "ret";
upload_logs "/var/tmp/abrt/abrt.tar.gz"; upload_logs "/var/tmp/abrt/abrt.tar.gz";
# Upload Anaconda logs
type_string "cd / && tar czvf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*";
send_key "ret";
upload_logs "/tmp/anaconda_tb.tar.gz";
} }
} }

7
tests/_boot_to_anaconda.pm
View File

@ -26,12 +26,7 @@ sub run {
my $fedora_version = ""; my $fedora_version = "";
my $repourl = ""; my $repourl = "";
if (get_var("VERSION") eq "rawhide"){ $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
$fedora_version = "rawhide";
}
else {
$fedora_version = (split /_/, get_var("BUILD"))[0];
}
$repourl = "http://download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; $repourl = "http://download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os";
type_string " inst.repo=".$repourl; type_string " inst.repo=".$repourl;

11
tests/install_source_graphical.pm
View File

@ -6,7 +6,7 @@ sub run {
# Anaconda hub # Anaconda hub
assert_screen "anaconda_main_hub", 300; # assert_screen "anaconda_main_hub", 300; #
# Go into the Install Sourcre spoke # Go into the Install Source spoke
assert_and_click "anaconda_main_hub_installation_source"; assert_and_click "anaconda_main_hub_installation_source";
@ -22,14 +22,9 @@ sub run {
# insert the url # insert the url
send_key "tab"; send_key "tab";
my $fedora_version = ""; my $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
my $repourl = ""; my $repourl = "";
if (get_var("VERSION") eq "rawhide"){ if ($fedora_version ne "rawhide"){
$fedora_version = "rawhide";
}
else {
$fedora_version = (split /_/, get_var("BUILD"))[0];
if (get_var("MIRRORLIST_GRAPHICAL")){ if (get_var("MIRRORLIST_GRAPHICAL")){
$fedora_version = "fedora-".$fedora_version; $fedora_version = "fedora-".$fedora_version;
} }

9
tests/install_source_variation.pm
View File

@ -9,16 +9,9 @@ sub run {
assert_screen "anaconda_main_hub"; assert_screen "anaconda_main_hub";
# FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate # FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate
my $fedora_version = ""; my $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
my $repourl = ""; my $repourl = "";
if (get_var("VERSION") eq "rawhide"){
$fedora_version = "rawhide";
}
else {
$fedora_version = (split /_/, get_var("BUILD"))[0];
}
$repourl = "download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; $repourl = "download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os";
# check that the repo was used # check that the repo was used