Merge "Change PTL informatin in INFO"

[bottlenecks.git] / testsuites / rubbos / run_rubbos.py

diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py
index 63b9ae0..f0fb089 100755 (executable)
--- a/testsuites/rubbos/run_rubbos.py
+++ b/testsuites/rubbos/run_rubbos.py
@@ -214,7 +214,7 @@ def rubbos_create_instances(
     print "Created stack, id=" + str(stack_id) + ", status=" + str(stack_status)
 
     timeInProgress = 0
-    while stack_status == "CREATE_IN_PROGRESS" and timeInProgress < 150:
+    while stack_status == "CREATE_IN_PROGRESS" and timeInProgress < 3600:
         print "  stack's status: %s, after %d seconds" % (stack_status, timeInProgress)
         time.sleep(5)
         timeInProgress = timeInProgress + 5
@@ -369,6 +369,11 @@ def rubbos_run():
     print "Exec shell: " + cmd
     subprocess.call(cmd, shell=True)
 
+    cmd = "scp " + ssh_args + Bottlenecks_repo_dir + \
+        "/utils/infra_setup/bottlenecks_key/bottlenecks_key ubuntu@" + control_public_ip + ":/home/ubuntu/"
+    print "Exec shell: " + cmd
+    subprocess.call(cmd, shell=True)
+
     # call remote run_rubbos_internal.sh
     cmd = "ssh " + ssh_args + " ubuntu@" + control_public_ip + \
         ' "sudo /home/ubuntu/run_rubbos_internal.sh /home/ubuntu/rubbos.conf /home/ubuntu/btnks-results" '
@@ -453,9 +458,13 @@ def main():
     else:
         print "Cannot create instances, as Failed to create image(s)."
         exit(-1)
-
-    print "Wait 600 seconds after stack creation..."
-    time.sleep(600)
+    
+    if stack_created:
+        print "The rubbos_stack is created successfully. \
+        Now to run rubbos instances!"
+    else:
+        print "The rubbos_stack failed to be created. Exit the test!"
+        exit(-1)
 
     # reboot_instances()
     # time.sleep(180)