X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fsystem-tests%2Flava2-submit.py;h=dec07a92affb55b45e28a7289eb2255ccd41995d;hb=f1d85a63f3cc5595dfa590c44e9d1510da3143ae;hp=4ff35c22eaa6316c2ae864ee0cf33b80cdfe777d;hpb=be7f51b658568ac8d4d83aaf55b6ee381a75e04f;p=lttng-ci.git diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index 4ff35c2..dec07a9 100644 --- a/scripts/system-tests/lava2-submit.py +++ b/scripts/system-tests/lava2-submit.py @@ -18,6 +18,7 @@ import argparse import json import os import random +import re import sys import time import xmlrpc.client @@ -30,19 +31,28 @@ USERNAME = 'lava-jenkins' HOSTNAME = 'lava-master-02.internal.efficios.com' OBJSTORE_URL = "https://obj.internal.efficios.com/lava/results/" +def parse_stable_version(stable_version_string): + # Get the major and minor version numbers from the lttng version string. + version_match = re.search('stable-(\d).(\d\d)', stable_version_string) + + if version_match is not None: + major_version = int(version_match.group(1)) + minor_version = int(version_match.group(2)) + else: + # Setting to zero to make the comparison below easier. + major_version = 0 + minor_version = 0 + return major_version, minor_version + class TestType: """ Enum like for test type """ - baremetal_benchmarks = 1 - baremetal_tests = 2 - kvm_tests = 3 - kvm_fuzzing_tests = 4 + baremetal_tests = 1 + kvm_tests = 2 values = { - 'baremetal-benchmarks': baremetal_benchmarks, 'baremetal-tests': baremetal_tests, 'kvm-tests': kvm_tests, - 'kvm-fuzzing-tests': kvm_fuzzing_tests, } @@ -72,7 +82,7 @@ def check_job_all_test_cases_state_count(server, job): """ print("Testcase result:") content = server.results.get_testjob_results_yaml(str(job)) - testcases = yaml.load(content) + testcases = yaml.unsafe_load(content) passed_tests = 0 failed_tests = 0 @@ -89,26 +99,6 @@ def check_job_all_test_cases_state_count(server, job): return (passed_tests, failed_tests) -def fetch_benchmark_results(build_id): - """ - Get the benchmark results from the objstore - save them as CSV files localy - """ - testcases = [ - 'processed_results_close.csv', - 'processed_results_ioctl.csv', - 'processed_results_open_efault.csv', - 'processed_results_open_enoent.csv', - 'processed_results_dup_close.csv', - 'processed_results_raw_syscall_getpid.csv', - 'processed_results_lttng_test_filter.csv', - ] - for testcase in testcases: - url = urljoin(OBJSTORE_URL, "{:s}/{:s}".format(build_id, testcase)) - print('Fetching {}'.format(url)) - urlretrieve(url, testcase) - - def print_test_output(server, job): """ Parse the attachment of the testcase to fetch the stdout of the test suite @@ -125,23 +115,29 @@ def print_test_output(server, job): continue if line['msg'] == '': print('----- TEST SUITE OUTPUT END -----') - break + print_line = False + continue if print_line: print("{} {}".format(line['dt'], line['msg'])) def get_vlttng_cmd( - lttng_tools_url, lttng_tools_commit, lttng_ust_url=None, lttng_ust_commit=None + lttng_version, lttng_tools_url, lttng_tools_commit, lttng_ust_url=None, lttng_ust_commit=None ): """ Return vlttng cmd to be used in the job template for setup. """ + urcu_profile = "" + if lttng_version == 'master' or (major_version >= 2 and minor_version >= 11): + urcu_profile = "urcu-master" + else: + urcu_profile = "urcu-stable-0.12" vlttng_cmd = ( - 'vlttng --jobs=$(nproc) --profile urcu-master' - ' --override projects.babeltrace.build-env.PYTHON=python3' + 'vlttng --jobs=$(nproc) --profile ' + urcu_profile + + ' --override projects.babeltrace.build-env.PYTHON=python3' ' --override projects.babeltrace.build-env.PYTHON_CONFIG=python3-config' - ' --profile babeltrace-stable-1.4' + ' --profile babeltrace-stable-1.5' ' --profile babeltrace-python' ' --profile lttng-tools-master' ' --override projects.lttng-tools.source=' @@ -161,6 +157,13 @@ def get_vlttng_cmd( + ' --profile lttng-ust-no-man-pages' ) + major_version, minor_version = parse_stable_version(lttng_version) + + if lttng_version == 'master' or (major_version >= 2 and minor_version >= 11): + vlttng_cmd += ( + ' --override projects.lttng-tools.configure+=--enable-test-sdt-uprobe' + ) + vlttng_path = '/tmp/virtenv' vlttng_cmd += ' ' + vlttng_path @@ -173,6 +176,7 @@ def main(): test_type = None parser = argparse.ArgumentParser(description='Launch baremetal test using Lava') parser.add_argument('-t', '--type', required=True) + parser.add_argument('-lv', '--lttng-version', required=True) parser.add_argument('-j', '--jobname', required=True) parser.add_argument('-k', '--kernel', required=True) parser.add_argument('-lm', '--lmodule', required=True) @@ -208,7 +212,7 @@ def main(): test_type = TestType.values[args.type] - if test_type in [TestType.baremetal_benchmarks, TestType.baremetal_tests]: + if test_type is TestType.baremetal_tests: device_type = DeviceType.x86 else: device_type = DeviceType.kvm @@ -216,9 +220,18 @@ def main(): vlttng_path = '/tmp/virtenv' vlttng_cmd = get_vlttng_cmd( - args.tools_url, args.tools_commit, args.ust_url, args.ust_commit + args.lttng_version, args.tools_url, args.tools_commit, args.ust_url, args.ust_commit ) + if args.lttng_version == "master": + lttng_version_string = "master" + elif args.lttng_version == "canary": + lttng_version_string = "2.10" + else: + major, minor = parse_stable_version(args.lttng_version) + lttng_version_string = str(major) + "." + str(minor) + + context = dict() context['DeviceType'] = DeviceType context['TestType'] = TestType @@ -230,6 +243,7 @@ def main(): context['vlttng_cmd'] = vlttng_cmd context['vlttng_path'] = vlttng_path + context['lttng_version_string'] = lttng_version_string context['kernel_url'] = args.kernel context['nfsrootfs_url'] = nfsrootfs @@ -292,8 +306,6 @@ def main(): 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(args.build_id) passed, failed = check_job_all_test_cases_state_count(server, jobid) print('With {} passed and {} failed Lava test cases.'.format(passed, failed))