Update lava-server

[lttng-ci.git] / scripts / system-tests / lava2-submit.py

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 5fb3b48837170c8fbf6660fa905c36e52045ed74..fe95daa5c9ffd619338055d952ef1e39cb2c335f 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -40,7 +40,7 @@ class TestType():
         'baremetal-benchmarks' : baremetal_benchmarks,
         'baremetal-tests' : baremetal_tests,
         'kvm-tests' : kvm_tests,
-        'kvm-fuzzin-tests' : kvm_fuzzing_tests,
+        'kvm-fuzzing-tests' : kvm_fuzzing_tests,
     }
 
 class DeviceType():
@@ -130,17 +130,14 @@ def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None):
                     ' --override projects.lttng-ust.checkout='+lttng_ust_commit+ \
                     ' --profile lttng-ust-no-man-pages'
 
-    if device is DeviceType.kvm:
-        vlttng_path = '/root/virtenv'
-    else:
-        vlttng_path = '/tmp/virtenv'
+    vlttng_path = '/tmp/virtenv'
 
     vlttng_cmd += ' ' + vlttng_path
 
     return vlttng_cmd
 
 def main():
-    nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_bionic_2018-11-29.tar.gz"
+    nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_xenial_2018-12-05.tar.gz"
     test_type = None
     parser = argparse.ArgumentParser(description='Launch baremetal test using Lava')
     parser.add_argument('-t', '--type', required=True)
@@ -180,11 +177,10 @@ def main():
 
     if test_type in [TestType.baremetal_benchmarks, TestType.baremetal_tests]:
         device_type = DeviceType.x86
-        vlttng_path = '/tmp/virtenv'
-
     else:
         device_type = DeviceType.kvm
-        vlttng_path = '/root/virtenv'
+
+    vlttng_path = '/tmp/virtenv'
 
     vlttng_cmd = get_vlttng_cmd(device_type, args.tools_commit, args.ust_commit)
 
@@ -231,7 +227,10 @@ def main():
             print('Job started running')
             running = True
         time.sleep(30)
-        jobstatus = server.scheduler.job_state(jobid)['job_state']
+        try:
+            jobstatus = server.scheduler.job_state(jobid)['job_state']
+        except xmlrpc.client.ProtocolError as e:
+            print('Protocol error, retring')
     print('Job ended with {} status.'.format(jobstatus))
 
     if jobstatus != 'Finished':