jjb: Use composite linux git tree

[lttng-ci.git] / scripts / lttng-baremetal-tests / lava-submit.py

diff --git a/scripts/lttng-baremetal-tests/lava-submit.py b/scripts/lttng-baremetal-tests/lava-submit.py
index 5566e8a486f44bbb4bdade98e9ddd38068b2d745..47f857cf98ad51d343e6191656fb23703556a1ba 100644 (file)
--- a/scripts/lttng-baremetal-tests/lava-submit.py
+++ b/scripts/lttng-baremetal-tests/lava-submit.py
@@ -150,7 +150,8 @@ def get_boot_cmd():
 def get_config_cmd(build_device):
     packages=['bsdtar', 'psmisc', 'wget', 'python3', 'python3-pip', \
             'libglib2.0-dev', 'libffi-dev', 'elfutils', 'libdw-dev', \
-            'libelf-dev', 'libmount-dev', 'libxml2', 'libpfm4-dev']
+            'libelf-dev', 'libmount-dev', 'libxml2', 'libpfm4-dev', \
+            'libnuma-dev']
     command = OrderedDict({
         'command': 'lava_command_run',
         'parameters': {
@@ -354,9 +355,9 @@ def main():
 
     lava_api_key = None
     try:
-        lava_api_key = os.environ['LAVA_FRDESO_TOKEN']
+        lava_api_key = os.environ['LAVA_JENKINS_TOKEN']
     except Exception as e:
-        print('LAVA_FRDESO_TOKEN not found in the environment variable. Exiting...', e )
+        print('LAVA_JENKINS_TOKEN not found in the environment variable. Exiting...', e )
         return -1
 
     if test_type is TestType.baremetal_benchmarks:
@@ -411,8 +412,6 @@ def main():
         time.sleep(30)
         jobstatus = server.scheduler.job_status(jobid)['job_status']
 
-    passed, failed=check_job_all_test_cases_state_count(server, jobid)
-
     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:
@@ -422,12 +421,13 @@ def main():
     if jobstatus not in 'Complete':
         return -1
     else:
+        passed, failed=check_job_all_test_cases_state_count(server, jobid)
         print('With {} passed and {} failed Lava test cases.'.format(passed, failed))
 
-    if failed == 0:
-        return 0
-    else:
-        return -1
+        if failed == 0:
+            return 0
+        else:
+            return -1
 
 if __name__ == "__main__":
     sys.exit(main())