add ability to run release tests without a prebuilt cloud. simplify t…

…he node2 test. don't try to remove keys with '_distcp_' in their name

py/h2o_common.py

@@ -88,7 +88,13 @@ def setUpClass(cls):
         print "setUpClass"
         # standard method for being able to reproduce the random.* seed
         h2o.setup_random_seed()
-        h2o.build_cloud_with_json()
+        # do a hack so we can run release tests with a -cj arg. so we don't have to build the cloud separately
+        # those tests will always want to run non-local (big machien) so detecting -cj is fine
+        if h2o.config_json:
+            h2o_hosts.build_cloud_with_hosts()
+        else:
+            # this is the normal thing for release tests (separate cloud was built. clone it)
+            h2o.build_cloud_with_json()
         # if you're fast with a test and cloud building, you may need to wait for cloud to stabilize
         # normally this is baked into build_cloud, but let's leave it here for now
         h2o.stabilize_cloud(h2o.nodes[0], node_count=len(h2o.nodes), timeoutSecs=90)

py/h2o_import.py

@@ -400,6 +400,8 @@ def delete_keys(node=None, pattern=None, timeoutSecs=120):
                 print "Not deleting a tree key from DRF: %s" % k
             elif 'DRF_' in k:
                 print "Not deleting DRF key..they may be problematic in flight: %s" % k
+            elif '_distcp_' in k:
+                print "Not deleting _distcp_ key..got a timeout before trying: %s" % k
             else:
                 node.remove_key(k['key'], timeoutSecs=timeoutSecs)
                 deletedCnt += 1

py/testdir_multi_jvm/test_exec_multi_node2.py

@@ -11,10 +11,11 @@
 print "restrict outstanding to # of nodes"
 
 # overrides the calc below if not None
-NODES = 3
+NODES = 2
 OUTSTANDING = NODES
+OUTSTANDING = 1
 TRIALMAX = 10
-TEST_MUX = True
+TEST_MUX = False
 READ_ONLY = True
 
 # problem with keyboard interrupt described