X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Flava-submit.py;h=7de270335a1e47a03eaaaa2efbded257b023e872;hb=78cb511cbcd5942bd22724f0ac3be561429e538f;hp=38a6fcfe156d024780ed0a834b1a3d3c6aa9a42b;hpb=6d7f7c1103a0d85403d6cd1bbfd65fa224280f79;p=lttng-ci.git

diff --git a/scripts/system-tests/lava-submit.py b/scripts/system-tests/lava-submit.py
index 38a6fcf..7de2703 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
@@ -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
@@ -446,8 +467,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'