X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Flava-submit.py;h=cb1f7794dc533862a0934a0d1692201274169afa;hb=a76a58f3a90663a5a9494f399eea63720b8d257c;hp=5d92177d56fde10d72f4c327ca2a9b81ba38a2d2;hpb=02126236dc58f0d88d92c2869868af3cac3af71c;p=lttng-ci.git diff --git a/scripts/system-tests/lava-submit.py b/scripts/system-tests/lava-submit.py index 5d92177..cb1f779 100644 --- a/scripts/system-tests/lava-submit.py +++ b/scripts/system-tests/lava-submit.py @@ -18,6 +18,7 @@ import argparse import base64 import json import os +import random import sys import time import xmlrpc.client @@ -111,17 +112,18 @@ def print_test_output(server, job): # Decode the base64 file and split on newlines to iterate # on list - testoutput = str(base64.b64decode(bytes(attachment['content'], encoding='UTF-8'))).split('\n') + testoutput = str(base64.b64decode(bytes(attachment['content'], encoding='UTF-8'))) + + testoutput = testoutput.replace('\\n', '\n') # Create a generator to iterate on the lines and keeping # the state of the iterator across the two loops. - testoutput_iter = iter(testoutput) + testoutput_iter = iter(testoutput.split('\n')) for line in testoutput_iter: # Find the header of the test case and start printing # from there if 'LAVA_SIGNAL_STARTTC run-tests' in line: - found = True print('---- TEST SUITE OUTPUT BEGIN ----') for line in testoutput_iter: if 'LAVA_SIGNAL_ENDTC run-tests' not in line: @@ -131,7 +133,6 @@ def print_test_output(server, job): # section break - if found is True: print('----- TEST SUITE OUTPUT END -----') break @@ -193,37 +194,37 @@ def get_baremetal_benchmarks_cmd(): { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/failing-close.yml' + 'testdef': 'lava/system-tests/failing-close.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/failing-ioctl.yml' + 'testdef': 'lava/system-tests/failing-ioctl.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/failing-open-efault.yml' + 'testdef': 'lava/system-tests/failing-open-efault.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/success-dup-close.yml' + 'testdef': 'lava/system-tests/success-dup-close.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/raw-syscall-getpid.yml' + 'testdef': 'lava/system-tests/raw-syscall-getpid.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/failing-open-enoent.yml' + 'testdef': 'lava/system-tests/failing-open-enoent.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/lttng-test-filter.yml' + 'testdef': 'lava/system-tests/lttng-test-filter.yml' } ], 'timeout': 7200 @@ -239,7 +240,7 @@ def get_baremetal_tests_cmd(): { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/perf-tests.yml' + 'testdef': 'lava/system-tests/perf-tests.yml' } ], 'timeout': 3600 @@ -255,19 +256,21 @@ def get_kvm_tests_cmd(): { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/kernel-tests.yml' + 'testdef': 'lava/system-tests/kernel-tests.yml' }, { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/destructive-tests.yml' + 'testdef': 'lava/system-tests/destructive-tests.yml' } ], 'timeout': 7200 } }) return command -def get_kprobes_test_cmd(): + +def get_kprobes_generate_data_cmd(): + random_seed = random.randint(0, 1000000) command = OrderedDict({ 'command': 'lava_test_shell', 'parameters': { @@ -275,10 +278,28 @@ def get_kprobes_test_cmd(): { 'git-repo': 'https://github.com/lttng/lttng-ci.git', 'revision': 'master', - 'testdef': 'lava/baremetal-tests/kprobe-fuzzing-tests.yml' + 'testdef': 'lava/system-tests/kprobe-fuzzing-generate-data.yml', + 'parameters': { 'RANDOM_SEED': str(random_seed) } } ], - 'timeout': 7200 + 'timeout': 60 + } + }) + return command + +def get_kprobes_test_cmd(round_nb): + command = OrderedDict({ + 'command': 'lava_test_shell', + 'parameters': { + 'testdef_repos': [ + { + 'git-repo': 'https://github.com/lttng/lttng-ci.git', + 'revision': 'master', + 'testdef': 'lava/system-tests/kprobe-fuzzing-tests.yml', + 'parameters': { 'ROUND_NB': str(round_nb) } + } + ], + 'timeout': 1000 } }) return command @@ -293,7 +314,7 @@ def get_results_cmd(stream_name): command['parameters']['stream']='/anonymous/'+stream_name+'/' return command -def get_deploy_cmd_kvm(jenkins_job, kernel_path, linux_modules_path, lttng_modules_path): +def get_deploy_cmd_kvm(jenkins_job, kernel_path, lttng_modules_path): command = OrderedDict({ 'command': 'deploy_kernel', 'metadata': {}, @@ -307,14 +328,13 @@ def get_deploy_cmd_kvm(jenkins_job, kernel_path, linux_modules_path, lttng_modul } }) - command['parameters']['customize'][SCP_PATH+linux_modules_path]=['rootfs:/','archive'] command['parameters']['customize'][SCP_PATH+lttng_modules_path]=['rootfs:/','archive'] command['parameters']['kernel'] = str(SCP_PATH+kernel_path) command['metadata']['jenkins_jobname'] = jenkins_job return command -def get_deploy_cmd_x86(jenkins_job, kernel_path, linux_modules_path, lttng_modules_path, nb_iter=None): +def get_deploy_cmd_x86(jenkins_job, kernel_path, lttng_modules_path, nb_iter=None): command = OrderedDict({ 'command': 'deploy_kernel', 'metadata': {}, @@ -326,7 +346,6 @@ def get_deploy_cmd_x86(jenkins_job, kernel_path, linux_modules_path, lttng_modul } }) - command['parameters']['overlays'].append( str(SCP_PATH+linux_modules_path)) command['parameters']['overlays'].append( str(SCP_PATH+lttng_modules_path)) command['parameters']['kernel'] = str(SCP_PATH+kernel_path) command['metadata']['jenkins_jobname'] = jenkins_job @@ -383,7 +402,6 @@ def main(): parser.add_argument('-t', '--type', required=True) parser.add_argument('-j', '--jobname', required=True) parser.add_argument('-k', '--kernel', required=True) - parser.add_argument('-km', '--kmodule', required=True) parser.add_argument('-lm', '--lmodule', required=True) parser.add_argument('-tc', '--tools-commit', required=True) parser.add_argument('-uc', '--ust-commit', required=False) @@ -410,13 +428,13 @@ def main(): if test_type is TestType.baremetal_benchmarks: j = create_new_job(args.jobname, build_device='x86') - j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.kmodule, args.lmodule)) + j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.lmodule)) elif test_type is TestType.baremetal_tests: j = create_new_job(args.jobname, build_device='x86') - j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.kmodule, args.lmodule)) + j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.lmodule)) elif test_type is TestType.kvm_tests or test_type is TestType.kvm_fuzzing_tests: j = create_new_job(args.jobname, build_device='kvm') - j['actions'].append(get_deploy_cmd_kvm(args.jobname, args.kernel, args.kmodule, args.lmodule)) + j['actions'].append(get_deploy_cmd_kvm(args.jobname, args.kernel, args.lmodule)) j['actions'].append(get_boot_cmd()) @@ -446,8 +464,9 @@ def main(): print('Tests runs need -uc/--ust-commit options. Exiting...') return -1 j['actions'].append(get_config_cmd('kvm')) - j['actions'].append(get_env_setup_cmd('kvm', args.tools_commit, args.ust_commit)) - j['actions'].append(get_kprobes_test_cmd()) + j['actions'].append(get_kprobes_generate_data_cmd()) + for i in range(10): + j['actions'].append(get_kprobes_test_cmd(round_nb=i)) j['actions'].append(get_results_cmd(stream_name='tests-kernel')) else: assert False, 'Unknown test type'