diff options
Diffstat (limited to 'testing/testing.conf')
| -rwxr-xr-x | testing/testing.conf | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/testing/testing.conf b/testing/testing.conf index 001cb862a..c7defbc6a 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -27,11 +27,6 @@ KERNELPATCH=ha-3.0.patch.bz2 # strongSwan version used in tests SWANVERSION=5.0.2dr4 -# Amount of Memory to use per UML [MB]. -# If "auto" is stated 1/12 of total host ram will be used. -# Examples: MEM=64, MEM="128", MEM="auto" -MEM=96 - # Directory where the UML kernels and file system will be built BUILDDIR=$UMLTESTDIR/umlbuild @@ -52,6 +47,9 @@ ROOTFSCOMPILEDIR=$BUILDDIR/compile # Path to guest images ROOTFSDIR=$BUILDDIR/root-fs +# libvirt config +VIRTIMGSTORE=/var/lib/libvirt/images + # Filename of the built UML Kernel UMLKERNEL=$BUILDDIR/linux-uml-$KERNELVERSION @@ -65,8 +63,7 @@ SSHCONF="-F $UMLTESTDIR/testing/ssh_config" TZUML="Europe/Zurich" ############################################################## -# Enable particular steps in the make-testing and -# start-testing scripts +# Enable particular steps in the make-testing # ENABLE_BUILD_BASEIMAGE="yes" ENABLE_BUILD_GUESTKERNEL="yes" @@ -113,35 +110,5 @@ bob,fec2::10" # VPN gateways / clients # The hosts stated here will be created. Possible values # are sun, moon, dave, carol, alice, venus, bob, winnetou. -# It's fine to make them all unless you don't have much -# resources. In this case we assume you know what you do! -# -STRONGSWANHOSTS="sun moon dave carol alice venus bob winnetou" - -############################################################## -# Needed programs, do not change! -# -PROGRAMS="uml_switch uml_mconsole ssh ssh-keygen iptables \ - chroot screen mkreiserfs" - -############################################################## -# IP parameters of the UML switches -# -IFCONFIG_0="192.168.0.254 netmask 255.255.255.0" -IFCONFIG_1="10.1.0.254 netmask 255.255.0.0" -IFCONFIG_2="10.2.0.254 netmask 255.255.0.0" - -############################################################## -# Network interfaces of the UML instances # -SWITCH_alice="eth0=tuntap,tap1_alice,fe:fd:0a:01:00:0a \ - eth1=tuntap,tap0_alice,fe:fd:c0:a8:00:32" -SWITCH_venus="eth0=tuntap,tap1_venus,fe:fd:0a:01:00:14" -SWITCH_moon="eth0=tuntap,tap0_moon,fe:fd:c0:a8:00:01 \ - eth1=tuntap,tap1_moon,fe:fd:0a:01:00:01" -SWITCH_carol="eth0=tuntap,tap0_carol,fe:fd:c0:a8:00:64" -SWITCH_winnetou="eth0=tuntap,tap0_winnetou,fe:fd:c0:a8:00:96" -SWITCH_dave="eth0=tuntap,tap0_dave,fe:fd:c0:a8:00:c8" -SWITCH_sun="eth0=tuntap,tap0_sun,fe:fd:c0:a8:00:02 \ - eth1=tuntap,tap2_sun,fe:fd:0a:02:00:01" -SWITCH_bob="eth0=tuntap,tap2_bob,fe:fd:0a:02:00:0a" +STRONGSWANHOSTS="alice bob carol dave moon sun venus winnetou" |