diff options
| author | Philip Hands <phil@hands.com> | 2017-06-29 22:11:09 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-08-01 00:53:58 -0400 |
| commit | a6f41c35e337db192e612ee6e1545fcae4c69ac7 (patch) | |
| tree | 3d03ff353fee11bb00de060f73c6b4d040173e9a /cucumber/features/domains | |
| parent | c49069662ccf276a7b97f77524f3e2638c9fa152 (diff) | |
| download | jenkins.debian.net-a6f41c35e337db192e612ee6e1545fcae4c69ac7.tar.xz | |
lvc: grab updates from tails (01371c19bd..6ae59c49e5)
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'cucumber/features/domains')
| -rw-r--r-- | cucumber/features/domains/cdrom.xml | 5 | ||||
| -rw-r--r-- | cucumber/features/domains/default.xml | 19 | ||||
| -rw-r--r-- | cucumber/features/domains/default_net.xml | 2 | ||||
| -rw-r--r-- | cucumber/features/domains/fs_share.xml | 6 |
4 files changed, 11 insertions, 21 deletions
diff --git a/cucumber/features/domains/cdrom.xml b/cucumber/features/domains/cdrom.xml new file mode 100644 index 00000000..8bc3be7c --- /dev/null +++ b/cucumber/features/domains/cdrom.xml @@ -0,0 +1,5 @@ +<disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdc' bus='sata'/> + <readonly/> +</disk> diff --git a/cucumber/features/domains/default.xml b/cucumber/features/domains/default.xml index 040a5d8e..0966ef9a 100644 --- a/cucumber/features/domains/default.xml +++ b/cucumber/features/domains/default.xml @@ -1,10 +1,9 @@ <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> - <name>DebianToaster</name> <memory unit='KiB'>1310720</memory> <currentMemory unit='KiB'>1310720</currentMemory> - <vcpu>1</vcpu> + <vcpu>2</vcpu> <os> - <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type> + <type arch='x86_64' machine='pc-q35-2.8'>hvm</type> <boot dev='cdrom'/> </os> <features> @@ -21,19 +20,11 @@ <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='cdrom'> - <driver name='qemu' type='raw'/> - <source file=''/> - <target dev='hdc' bus='ide'/> - <readonly/> - </disk> - <controller type='usb' index='0' model='ich9-ehci1'/> - <controller type='usb' index='0' model='ich9-uhci1'> - <master startport='0'/> - </controller> - <controller type='ide' index='0'/> + <controller type='usb' index='0' model='nec-xhci'/> + <controller type='sata' index='0'/> <controller type='virtio-serial' index='0'/> <interface type='network'> + <alias name='net0'/> <!-- <mac address='52:54:00:ac:dd:ee'/> --> <source network='lvcNET'/> <model type='virtio'/> diff --git a/cucumber/features/domains/default_net.xml b/cucumber/features/domains/default_net.xml index 35a1c61e..e9a575df 100644 --- a/cucumber/features/domains/default_net.xml +++ b/cucumber/features/domains/default_net.xml @@ -1,11 +1,11 @@ <network> - <name>lvcNET</name> <forward mode='nat'/> <bridge name='virbr10' stp='on' delay='0' /> <ip address='10.2.1.1' netmask='255.255.255.0'> <dhcp> <range start='10.2.1.2' end='10.2.1.254' /> <!-- <host mac="52:54:00:ac:dd:ee" name="amnesia" ip="10.2.1.2" /> --> + <!-- <host mac="52:54:00:11:22:33" name="amnesia" ip="10.2.1.3" /> --> </dhcp> </ip> <ip family="ipv6" address="fc00::1" prefix="7" /> diff --git a/cucumber/features/domains/fs_share.xml b/cucumber/features/domains/fs_share.xml deleted file mode 100644 index 718755ea..00000000 --- a/cucumber/features/domains/fs_share.xml +++ /dev/null @@ -1,6 +0,0 @@ -<filesystem type='mount' accessmode='passthrough'> - <driver type='path' wrpolicy='immediate'/> - <source dir=''/> - <target dir=''/> - <readonly/> -</filesystem> |