[pkg-kolab] r1431 - pkg-kolab_testsuite

[Mathieu Parent]

Author: sathieu
Date: 2009-11-27 23:10:56 +0000 (Fri, 27 Nov 2009)
New Revision: 1431

Modified:
   pkg-kolab_testsuite/testsuite
   pkg-kolab_testsuite/testsuite.ini
Log:
- Each platform with own directory
- offset for ip adress to allow installation of different platforms together

Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite	2009-11-27 22:51:44 UTC (rev 1430)
+++ pkg-kolab_testsuite/testsuite	2009-11-27 23:10:56 UTC (rev 1431)
@@ -189,7 +189,7 @@
 {
     my $domid = shift;
     my $domname = shift;
-    return "192.168.0.".($domid+10);
+    return "192.168.0.".($domid+conf('ip_offset'));
 }
 
 #-------------------------------------------------------

Modified: pkg-kolab_testsuite/testsuite.ini
===================================================================
--- pkg-kolab_testsuite/testsuite.ini	2009-11-27 22:51:44 UTC (rev 1430)
+++ pkg-kolab_testsuite/testsuite.ini	2009-11-27 23:10:56 UTC (rev 1431)
@@ -1,7 +1,7 @@
 [default]
 ; general
 slave_count=1
-storage_pool_dir=/var/tmp/pkg-kolab_testsuite
+storage_pool_dir=/var/tmp/pkg-kolab_testsuite/unknown
 user=mathieu;$<  # $REAL_USER_ID
 group=disk
 
@@ -19,22 +19,32 @@
 ; network
 bridge=br0
 dns_domain=local.tld
+ip_offset=10
 
 ; kolab conf
 kolab_installation_method=native; native openpkg
 kolab_manager_password=12345
 ca_passphrase=12345678
 
-[debian-sid-native]
-vm_install_method=debootstrap
-vm_dist=sid
-kolab_installation_method=native
+[debian-sid-openpkg]
+storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-openpkg
 
-[debian-sid-openpkg]
 vm_memory=512Mb; more for compilation
 vm_size=2Gb; more for all the source and compiled packages
-
 vm_install_method=debootstrap
 vm_dist=sid
+
+ip_offset=10
+
 kolab_installation_method=openpkg
 
+[debian-sid-native]
+storage_pool_dir=/var/tmp/pkg-kolab_testsuite/debian-sid-native
+
+vm_install_method=debootstrap
+vm_dist=sid
+
+ip_offset=20
+
+kolab_installation_method=native
+