From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 22 Feb 2009 08:11:19 +0000 (+0000)
Subject: test infrastructure has changed
X-Git-Tag: tests-4.2-12~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ac89b26fc32f504bbf6325987c94d2e44f2e2ed0;p=tests.git

test infrastructure has changed
---

diff --git a/system/config_1testbox.py b/system/config_1testbox.py
index aa44e7d..3e7aef9 100644
--- a/system/config_1testbox.py
+++ b/system/config_1testbox.py
@@ -6,21 +6,23 @@ from TestMapper import TestMapper
 
 def config (plcs, options):
 
-    if options.arch == "i386":
-        target = 'testbox32.onelab.eu'
-    elif options.arch == "x86_64":
-        target = 'testbox64.onelab.eu'
-    else:
-        print 'Unsupported arch %s'%options.arch
-        sys.exit(1)
+    plc_box='testbox-plc.onelab.eu'
+    qemu_box='testbox1.onelab.eu'
+#    if options.arch == "i386":
+#        target = 'testbox32.onelab.eu'
+#    elif options.arch == "x86_64":
+#        target = 'testbox64.onelab.eu'
+#    else:
+#        print 'Unsupported arch %s'%options.arch
+#        sys.exit(1)
 
-    mapper = {'plc': [ ('*' , {'hostname':target,
-                               'PLC_DB_HOST':target,
-                               'PLC_API_HOST':target,
-                               'PLC_BOOT_HOST':target,
-                               'PLC_WWW_HOST':target,
+    mapper = {'plc': [ ('*' , {'hostname':plc_box,
+                               'PLC_DB_HOST':plc_box,
+                               'PLC_API_HOST':plc_box,
+                               'PLC_BOOT_HOST':plc_box,
+                               'PLC_WWW_HOST':plc_box,
                                'name':'%s-'+options.arch } ) ],
-              'node': [ ('*' , {'host_box': target } ) ],
+              'node': [ ('*' , {'host_box': qemu_box } ) ],
               }
     
     return TestMapper(plcs,options).map(mapper)