From 1fa123006633aa1f148dbfc637213f7a6239be4a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 7 Apr 2021 13:38:27 +0800 Subject: [PATCH] qa/tasks/mgr: skip test_diskprediction_local on python>=3.8 query the python version before trying to test diskprediction_local Fixes: https://tracker.ceph.com/issues/50196 Signed-off-by: Kefu Chai (cherry picked from commit 39b2b5edc008900d531be95ece1ce75a1e036914) Conflicts: qa/tasks/mgr/test_module_selftest.py --- qa/suites/rados/mgr/tasks/module_selftest.yaml | 1 + qa/tasks/mgr/test_module_selftest.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/qa/suites/rados/mgr/tasks/module_selftest.yaml b/qa/suites/rados/mgr/tasks/module_selftest.yaml index deab01adb05dd..905e6f783008e 100644 --- a/qa/suites/rados/mgr/tasks/module_selftest.yaml +++ b/qa/suites/rados/mgr/tasks/module_selftest.yaml @@ -23,3 +23,4 @@ tasks: - cephfs_test_runner: modules: - tasks.mgr.test_module_selftest + fail_on_skip: false diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py index 63cf39a3b7af6..a982ad3c456e8 100644 --- a/qa/tasks/mgr/test_module_selftest.py +++ b/qa/tasks/mgr/test_module_selftest.py @@ -3,6 +3,7 @@ import time import requests import errno import logging + from teuthology.exceptions import CommandFailedError from tasks.mgr.mgr_test_case import MgrTestCase @@ -49,6 +50,13 @@ class TestModuleSelftest(MgrTestCase): self._selftest_plugin("influx") def test_diskprediction_local(self): + self._load_module("selftest") + python_version = self.mgr_cluster.mon_manager.raw_cluster_cmd( + "mgr", "self-test", "python-version") + if tuple(int(v) for v in python_version.split('.')) >= (3, 8): + # https://tracker.ceph.com/issues/45147 + self.skipTest(f'python {python_version} not compatible with ' + 'diskprediction_local') self._selftest_plugin("diskprediction_local") # Not included in qa/packages/packages.yaml -- 2.47.3