From: Daniel Persson <mailto.woden@gmail.com>
Date: Sat, 13 Aug 2022 07:41:14 +0000 (+0200)
Subject: mgr/diskprediction_local: Support Python 3.9 for disk prediction module.
X-Git-Tag: v18.0.0~193^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1969a63f9e99cff7d96c3d1c6cfe12124f137579;p=ceph-ci.git

mgr/diskprediction_local: Support Python 3.9 for disk prediction module.

Signed-off-by: Daniel Persson <mailto.woden@gmail.com>
---

diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py
index 0f64adbd885..7ac2960371c 100644
--- a/qa/tasks/mgr/test_module_selftest.py
+++ b/qa/tasks/mgr/test_module_selftest.py
@@ -54,7 +54,7 @@ class TestModuleSelftest(MgrTestCase):
         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):
+        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')
diff --git a/src/common/options/CMakeLists.txt b/src/common/options/CMakeLists.txt
index da24c673f6b..f12a5513a63 100644
--- a/src/common/options/CMakeLists.txt
+++ b/src/common/options/CMakeLists.txt
@@ -76,7 +76,7 @@ endif()
 set(mgr_disabled_modules "")
 if(WITH_MGR)
   # https://tracker.ceph.com/issues/45147
-  if(Python3_VERSION VERSION_GREATER_EQUAL 3.8)
+  if(Python3_VERSION VERSION_EQUAL 3.8)
     set(mgr_disabled_modules "diskprediction_local")
     message(STATUS "mgr module disabled for ${Python3_VERSION}: ${mgr_disabled_modules}")
   endif()