diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-12-19 02:49:03 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-12-21 09:47:01 +0100 |
| commit | 2eba6879e539d8a793542857fd7e45bb572545ef (patch) | |
| tree | bb1ffd13a8df0a7bbc4cfcb380e6a8b32090bf00 | |
| parent | 3d18cc1bf43bb5968dab77ec9b22d54de9cd602b (diff) | |
| download | jenkins.debian.net-2eba6879e539d8a793542857fd7e45bb572545ef.tar.xz | |
lvc: s#TailsToaster#DebianToaster#g
| -rwxr-xr-x | bin/libvirt_cucumber_tests | 2 | ||||
| -rw-r--r-- | features/domains/default.xml | 4 | ||||
| -rw-r--r-- | features/domains/default_net.xml | 2 | ||||
| -rw-r--r-- | features/domains/storage_pool.xml | 2 | ||||
| -rw-r--r-- | features/support/config.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/bin/libvirt_cucumber_tests b/bin/libvirt_cucumber_tests index bd90741e..e7670b0b 100755 --- a/bin/libvirt_cucumber_tests +++ b/bin/libvirt_cucumber_tests @@ -26,7 +26,7 @@ Options for '@product' features: --temp-dir Directory where various temporary files are written during a test, e.g. VM snapshots and memory dumps, failure screenshots, pcap files and disk images - (default is /tmp/TailsToaster). + (default is /tmp/DebianToaster). --view Shows the test session in a windows. Requires x11vnc and xtightvncviewer. --vnc-server-only Starts a VNC server for the test session. Requires x11vnc. diff --git a/features/domains/default.xml b/features/domains/default.xml index 3d25576f..6050d6b3 100644 --- a/features/domains/default.xml +++ b/features/domains/default.xml @@ -1,5 +1,5 @@ <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> - <name>TailsToaster</name> + <name>DebianToaster</name> <memory unit='KiB'>1310720</memory> <currentMemory unit='KiB'>1310720</currentMemory> <vcpu>1</vcpu> @@ -37,7 +37,7 @@ </controller> <interface type='network'> <mac address='52:54:00:ac:dd:ee'/> - <source network='TailsToasterNet'/> + <source network='DebianToasterNet'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> <link state='up'/> diff --git a/features/domains/default_net.xml b/features/domains/default_net.xml index d37935b8..fd2966eb 100644 --- a/features/domains/default_net.xml +++ b/features/domains/default_net.xml @@ -1,5 +1,5 @@ <network> - <name>TailsToasterNet</name> + <name>DebianToasterNet</name> <forward mode='nat'/> <bridge name='virbr10' stp='on' delay='0' /> <ip address='10.2.1.1' netmask='255.255.255.0'> diff --git a/features/domains/storage_pool.xml b/features/domains/storage_pool.xml index 3e12f8b6..ce0a6915 100644 --- a/features/domains/storage_pool.xml +++ b/features/domains/storage_pool.xml @@ -1,5 +1,5 @@ <pool type="dir"> - <name>TailsToasterStorage</name> + <name>DebianToasterStorage</name> <target> <path></path> </target> diff --git a/features/support/config.rb b/features/support/config.rb index f7f1cb34..80f23c10 100644 --- a/features/support/config.rb +++ b/features/support/config.rb @@ -4,7 +4,7 @@ require "features/support/helpers/misc_helpers.rb" # Dynamic $tails_iso = ENV['ISO'] || get_newest_iso $old_tails_iso = ENV['OLD_ISO'] || get_oldest_iso -$tmp_dir = ENV['TEMP_DIR'] || "/tmp/TailsToaster" +$tmp_dir = ENV['TEMP_DIR'] || "/tmp/DebianToaster" $vm_xml_path = ENV['VM_XML_PATH'] $misc_files_dir = "features/misc_files" $keep_snapshots = !ENV['KEEP_SNAPSHOTS'].nil? |