Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copy HDD & ISO images from NFS to host's storage #2612

Merged
merged 1 commit into from Mar 29, 2017
Merged

Copy HDD & ISO images from NFS to host's storage #2612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 23 additions & 15 deletions tests/installation/bootloader_svirt.pm
View file
Open in desktop
@@ -1,6 +1,6 @@
# SUSE's openQA tests
#
# Copyright © 2016 SUSE LLC
# Copyright © 2016-2017 SUSE LLC
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
Expand All @@ -17,6 +17,15 @@ use testapi;
use utils;
use File::Basename;

sub copy_image {
my ($file, $dir) = @_;
my $basename = basename($file);
my $path = `find $dir -name $basename | head -n1 | tr -d '\n'`;
diag("Path found: $path");
type_string("# Copying image $basename...\n");
return $path;
}

sub run() {
my $arch = get_var('ARCH');
my $vmm_family = get_required_var('VIRSH_VMM_FAMILY');
Expand Down Expand Up @@ -68,24 +77,26 @@ sub run() {
$svirt->change_domain_element(os => cmdline => $cmdline);
}

my $hdddir = '/var/lib/openqa/share/factory/hdd';
my $size_i = get_var('HDDSIZEGB', '24');
# In JeOS we have the disk, we just need to deploy it, for the rest
# - installs from network and ISO media - we have to create it.
if (my $hddfile = get_var('HDD_1')) {
my $hddpath = copy_image($hddfile, $hdddir);
$svirt->add_disk(
{
size => $size_i . 'G',
file => ($vmm_family eq 'vmware') ? basename($hddfile) : $hddfile,
dev_id => 'a',
bootorder => 1
file => ($vmm_family eq 'vmware') ? basename($hddpath) : $hddpath,
dev_id => 'a',
bootorder => 1,
backingfile => 1
});
if (my $extra_hdd = get_var('HDD_2')) {
my $extra_hddpath = copy_image($extra_hdd, $hdddir);
$svirt->add_disk(
{
file => ($vmm_family eq 'vmware') ? basename($extra_hdd) : $extra_hdd,
file => ($vmm_family eq 'vmware') ? basename($extra_hddpath) : $extra_hddpath,
dev_id => 'b'
});

}
}
else {
Expand All @@ -98,16 +109,15 @@ sub run() {
});
}

my $isodir = '/var/lib/openqa/share/factory/iso';
# In JeOS and netinstall we don't have ISO media, for the rest we have to attach it.
if (!get_var('NETBOOT') and !is_jeos() and !get_var('HDD_1')) {
my $isofile = get_required_var('ISO');
if ($vmm_family eq 'vmware') {
$isofile = basename($isofile);
}
my $isopath = copy_image($isofile, $isodir);
$svirt->add_disk(
{
cdrom => 1,
file => $isofile,
file => ($vmm_family eq 'vmware') ? basename($isopath) : $isopath,
dev_id => 'b',
bootorder => 2
});
Expand All @@ -116,13 +126,11 @@ sub run() {
my $dev_id = 'c';
foreach my $n (1 .. 9) {
if (my $addon_isofile = get_var("ISO_" . $n)) {
if ($vmm_family eq 'vmware') {
$addon_isofile = basename($addon_isofile);
}
my $addon_isopath = copy_image($addon_isofile, $isodir);
$svirt->add_disk(
{
cdrom => 1,
file => $addon_isofile,
file => ($vmm_family eq 'vmware') ? basename($addon_isopath) : $addon_isopath,
dev_id => $dev_id
});
$dev_id = chr((ord $dev_id) + 1); # return next letter in alphabet
Expand Down
2 changes: 1 addition & 1 deletion tests/installation/bootloader_zkvm.pm
View file
Open in desktop
Expand Up @@ -77,7 +77,7 @@ sub run() {
chomp(my $hdd_path = `find $hdd_dir -name $basename | head -n1`);
diag("HDD path found: $hdd_path");
type_string("# copying image...\n");
$svirt->add_disk({copy => 1, file => $hdd_path, dev_id => 'a'});
$svirt->add_disk({file => $hdd_path, dev_id => 'a'}); # Copy disk to local storage
}
else {
$svirt->add_disk({size => $size_i . "G", create => 1, dev_id => 'a'});
Expand Down