X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fsystem-tests%2Flava2-submit.py;h=f5a61d3c265b3134203a32ff95147a072aaaaddb;hb=4c3d6586845915a86b9c6b4a7237a1991b8ac552;hp=cea672ca034c6095ce0ce32023bade4f19c4f2d8;hpb=4cd30b99186529cb025191b0f8418ef0c5ee4999;p=lttng-ci.git

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index cea672c..f5a61d3 100644
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -23,13 +23,12 @@ import sys
 import time
 import yaml
 import xmlrpc.client
-from collections import OrderedDict
-from enum import Enum
+import pprint
+
 from jinja2 import Environment, FileSystemLoader, meta
 
-USERNAME = 'frdeso'
-HOSTNAME = 'lava-master.internal.efficios.com'
-SCP_PATH = 'scp://jenkins-lava@storage.internal.efficios.com'
+USERNAME = 'lava-jenkins'
+HOSTNAME = 'lava-master-02.internal.efficios.com'
 
 class TestType():
     baremetal_benchmarks=1
@@ -45,7 +44,7 @@ class TestType():
 
 class DeviceType():
     x86 = 'x86'
-    kvm = 'kvm'
+    kvm = 'qemu'
     values = {
         'kvm' : kvm,
         'x86' : x86,
@@ -184,6 +183,7 @@ def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None):
     return vlttng_cmd
 
 def main():
+    nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
     test_type = None
     parser = argparse.ArgumentParser(description='Launch baremetal test using Lava')
     parser.add_argument('-t', '--type', required=True)
@@ -206,9 +206,9 @@ def main():
     lava_api_key = None
     if not args.debug:
         try:
-            lava_api_key = os.environ['LAVA_JENKINS_TOKEN']
+            lava_api_key = os.environ['LAVA2_JENKINS_TOKEN']
         except Exception as e:
-            print('LAVA_JENKINS_TOKEN not found in the environment variable. Exiting...', e )
+            print('LAVA2_JENKINS_TOKEN not found in the environment variable. Exiting...', e )
             return -1
 
     jinja_loader = FileSystemLoader(os.path.dirname(os.path.realpath(__file__)))
@@ -224,12 +224,10 @@ def main():
     if test_type in [TestType.baremetal_benchmarks, TestType.baremetal_tests]:
         device_type = DeviceType.x86
         vlttng_path = '/tmp/virtenv'
-        nfsrootfs = "/storage/jenkins-lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
 
     else:
         device_type = DeviceType.kvm
         vlttng_path = '/root/virtenv'
-        nfsrootfs = "/storage/jenkins-lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
 
     vlttng_cmd = get_vlttng_cmd(device_type, args.tools_commit, args.ust_commit)
 
@@ -253,18 +251,23 @@ def main():
 
     context['kprobe_round_nb'] = 10
 
-    print(context)
-    print(jinja_template.render(context))
+    render = jinja_template.render(context)
+
+    print('Current context:')
+    pprint.pprint(context, indent=4)
+    print('Job to be submitted:')
+
+    print(render)
 
     if args.debug:
         return 0
 
     server = xmlrpc.client.ServerProxy('http://%s:%s@%s/RPC2' % (USERNAME, lava_api_key, HOSTNAME))
 
-    jobid = server.scheduler.submit_job(json.dumps(j))
+    jobid = server.scheduler.submit_job(render)
 
     print('Lava jobid:{}'.format(jobid))
-    print('Lava job URL: http://lava-master.internal.efficios.com/scheduler/job/{}/log_file'.format(jobid))
+    print('Lava job URL: http://lava-master-02.internal.efficios.com/scheduler/job/{}/log_file'.format(jobid))
 
     #Check the status of the job every 30 seconds
     jobstatus = server.scheduler.job_status(jobid)['job_status']
@@ -276,10 +279,11 @@ def main():
         time.sleep(30)
         jobstatus = server.scheduler.job_status(jobid)['job_status']
 
-    if test_type is TestType.kvm_tests or test_type is TestType.baremetal_tests:
-        print_test_output(server, jobid)
-    elif test_type is TestType.baremetal_benchmarks:
-        fetch_benchmark_results(server, jobid)
+#    Do not fetch result for now
+#    if test_type is TestType.kvm_tests or test_type is TestType.baremetal_tests:
+#        print_test_output(server, jobid)
+#    elif test_type is TestType.baremetal_benchmarks:
+#        fetch_benchmark_results(server, jobid)
 
     print('Job ended with {} status.'.format(jobstatus))
     if jobstatus not in 'Complete':