From ec1b82fd24220a8cff442194ca98be9ed7ea1816 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 2 Mar 2021 19:43:15 -0800 Subject: [PATCH] qa: skip exit-on-first-failure option for valgrind on ubuntu The valgrind version is too old. Signed-off-by: Patrick Donnelly --- qa/suites/fs/verify/distro | 1 - qa/suites/fs/verify/distro/$ | 0 qa/suites/fs/verify/distro/.qa | 1 + qa/suites/fs/verify/distro/centos_8.yaml | 1 + qa/suites/fs/verify/distro/rhel_8.yaml | 1 + qa/suites/fs/verify/distro/ubuntu/+ | 0 qa/suites/fs/verify/distro/ubuntu/.qa | 1 + qa/suites/fs/verify/distro/ubuntu/latest.yaml | 1 + qa/suites/fs/verify/distro/ubuntu/overrides.yaml | 4 ++++ qa/tasks/ceph.py | 15 +++++++++------ 10 files changed, 18 insertions(+), 7 deletions(-) delete mode 120000 qa/suites/fs/verify/distro create mode 100644 qa/suites/fs/verify/distro/$ create mode 120000 qa/suites/fs/verify/distro/.qa create mode 120000 qa/suites/fs/verify/distro/centos_8.yaml create mode 120000 qa/suites/fs/verify/distro/rhel_8.yaml create mode 100644 qa/suites/fs/verify/distro/ubuntu/+ create mode 120000 qa/suites/fs/verify/distro/ubuntu/.qa create mode 120000 qa/suites/fs/verify/distro/ubuntu/latest.yaml create mode 100644 qa/suites/fs/verify/distro/ubuntu/overrides.yaml diff --git a/qa/suites/fs/verify/distro b/qa/suites/fs/verify/distro deleted file mode 120000 index 78f2991b407..00000000000 --- a/qa/suites/fs/verify/distro +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$/ \ No newline at end of file diff --git a/qa/suites/fs/verify/distro/$ b/qa/suites/fs/verify/distro/$ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/fs/verify/distro/.qa b/qa/suites/fs/verify/distro/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/fs/verify/distro/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/verify/distro/centos_8.yaml b/qa/suites/fs/verify/distro/centos_8.yaml new file mode 120000 index 00000000000..380a1443b78 --- /dev/null +++ b/qa/suites/fs/verify/distro/centos_8.yaml @@ -0,0 +1 @@ +.qa/distros/all/centos_8.yaml \ No newline at end of file diff --git a/qa/suites/fs/verify/distro/rhel_8.yaml b/qa/suites/fs/verify/distro/rhel_8.yaml new file mode 120000 index 00000000000..133acf27bff --- /dev/null +++ b/qa/suites/fs/verify/distro/rhel_8.yaml @@ -0,0 +1 @@ +.qa/distros/all/rhel_8.yaml \ No newline at end of file diff --git a/qa/suites/fs/verify/distro/ubuntu/+ b/qa/suites/fs/verify/distro/ubuntu/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/fs/verify/distro/ubuntu/.qa b/qa/suites/fs/verify/distro/ubuntu/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/fs/verify/distro/ubuntu/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/verify/distro/ubuntu/latest.yaml b/qa/suites/fs/verify/distro/ubuntu/latest.yaml new file mode 120000 index 00000000000..162964882d3 --- /dev/null +++ b/qa/suites/fs/verify/distro/ubuntu/latest.yaml @@ -0,0 +1 @@ +.qa/distros/all/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/suites/fs/verify/distro/ubuntu/overrides.yaml b/qa/suites/fs/verify/distro/ubuntu/overrides.yaml new file mode 100644 index 00000000000..fdd7f5e5a72 --- /dev/null +++ b/qa/suites/fs/verify/distro/ubuntu/overrides.yaml @@ -0,0 +1,4 @@ +overrides: + ceph: + valgrind: + exit_on_first_error: false diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 18fb862b5b3..a13f06c7317 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -1387,13 +1387,16 @@ def run_daemon(ctx, config, type_): profile_path = '/var/log/ceph/profiling-logger/%s.prof' % (role) run_cmd.extend(['env', 'CPUPROFILE=%s' % profile_path]) - if config.get('valgrind') is not None: + vc = config.get('valgrind') + if vc is not None: valgrind_args = None - if type_ in config['valgrind']: - valgrind_args = config['valgrind'][type_] - if role in config['valgrind']: - valgrind_args = config['valgrind'][role] - run_cmd = get_valgrind_args(testdir, role, run_cmd, valgrind_args) + if type_ in vc: + valgrind_args = vc[type_] + if role in vc: + valgrind_args = vc[role] + exit_on_first_error = vc.get('exit_on_first_error', True) + run_cmd = get_valgrind_args(testdir, role, run_cmd, valgrind_args, + exit_on_first_error=exit_on_first_error) run_cmd.extend(run_cmd_tail) log_path = f'/var/log/ceph/{cluster_name}-{type_}.{id_}.log' -- 2.47.3