Merge branch 'master' of bitbucket.org:rajcze/openqa_fedora
This commit is contained in:
commit
ab6aea3cb2
@ -63,6 +63,9 @@ cp openqa.conf.template openqa.conf
|
||||
# provider = https://id.fedoraproject.org/
|
||||
|
||||
|
||||
# apply patch fixing machine-pausing in QEMU, if needed
|
||||
# https://github.com/os-autoinst/os-autoinst/commit/c8896375288d5f39424cf06108a92c8498c4aff3
|
||||
|
||||
# services
|
||||
systemctl enable apache2
|
||||
systemctl restart apache2
|
||||
|
32
QEMU_variables.txt
Normal file
32
QEMU_variables.txt
Normal file
@ -0,0 +1,32 @@
|
||||
= QEMU settings =
|
||||
|
||||
Set via variables per-testsuite in the OpenQA-opensuse tests (might make more sense to do it per-machine):
|
||||
|
||||
# disk settings
|
||||
$vars->{NUMDISKS} ||= 1;
|
||||
$vars->{HDDSIZEGB} ||= 10;
|
||||
$vars->{HDDMODEL} ||= "virtio-blk";
|
||||
# network settings
|
||||
$vars->{NICMODEL} ||= "virtio-net";
|
||||
$vars->{NICTYPE} ||= "user";
|
||||
$vars->{NICMAC} ||= "52:54:00:12:34:56";
|
||||
# misc
|
||||
if (!$vars->{OFW}) {
|
||||
$vars->{QEMUVGA} ||= ["cirrus"];
|
||||
}
|
||||
else {
|
||||
$vars->{QEMUVGA} ||= [ 'std', '-g', '1024x768' ];
|
||||
}
|
||||
$vars->{QEMUCPUS} ||= 1;
|
||||
if ( defined( $vars->{RAIDLEVEL} ) ) {
|
||||
$vars->{NUMDISKS} = 4;
|
||||
}
|
||||
|
||||
|
||||
|
||||
UEFI, USBBOOT, KEEPHDDS, LAPTOP - ???
|
||||
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user