From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sat, 22 May 2010 08:10:16 +0000 (+0200)
Subject: do not pull build anymore
X-Git-Tag: tests-5.0-6~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ecf7115c72e620174e507f07da0f1f612a61be90;p=tests.git

do not pull build anymore
---

diff --git a/system/TestMain.py b/system/TestMain.py
index 95c05e0..a8b29ef 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -22,7 +22,7 @@ class TestMain:
 
     default_config = [ 'default' ] 
 
-    default_build_url = "http://svn.planet-lab.org/svn/build/trunk"
+    default_build_url = "git://git.onelab.eu/tests"
 
     def __init__ (self):
 	self.path=os.path.dirname(sys.argv[0]) or "."
@@ -70,15 +70,13 @@ class TestMain:
         usage = """usage: %%prog [options] steps
 arch-rpms-url defaults to the last value used, as stored in arg-arch-rpms-url,
    no default
-build-url defaults to the last value used, as stored in arg-build-url, 
-   or %s
 config defaults to the last value used, as stored in arg-config,
    or %r
 ips_node, ips_plc and ips_qemu defaults to the last value used, as stored in arg-ips-{node,plc,qemu},
    default is to use IP scanning
 steps refer to a method in TestPlc or to a step_* module
 ===
-"""%(TestMain.default_build_url,TestMain.default_config)
+"""%(TestMain.default_config)
         usage += self.steps_message
         parser=OptionParser(usage=usage,version=self.subversion_id)
         parser.add_option("-u","--url",action="store", dest="arch_rpms_url", 
diff --git a/system/TestPlc.py b/system/TestPlc.py
index 85fb971..b8e8517 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -461,10 +461,20 @@ class TestPlc:
         else:
             # use a standard name - will be relative to remote buildname
             build_dir="build"
-	# run checkout in any case - would do an update if already exists
-        build_checkout = "svn checkout %s %s"%(self.options.build_url,build_dir)
-        if self.run_in_host(build_checkout) != 0:
+
+        # historically the build was being fetched by the tests
+        # if we've got a build/ locally, we don't need to mess with the build url
+        if os.path.isdir('build'):
+            self.test_ssh.mkdir(build_dir)
+            self.test_ssh.copy_abs('build',build_dir,recursive=True)
+        else:
+	    # use old svn strategy run checkout in any case - would do an update if already exists
+            print "WARNING: The tests module no longer has the ability to pull the build module from svn"
+            print "Please extract a build module under 'build'"
             return False
+            build_checkout = "svn checkout %s %s"%(self.options.build_url,build_dir)
+            if self.run_in_host(build_checkout) != 0:
+                return False
         # the repo url is taken from arch-rpms-url 
         # with the last step (i386) removed
         repo_url = self.options.arch_rpms_url