Deploy cmk to site-packages

CMK-33645

Change-Id: Id3d946b27ea82c531e71370f20edd81e81d3f676

Author: TimotheusBachinger

cmk/BUILD

@@ -571,7 +571,6 @@ build_test(
 
 package_wheel(
     name = "cmk_tar",
-    prefix = "lib/python3",
     visibility = ["//visibility:public"],
     whl = "whl",
 )

omd/packages/check_mk/skel/etc/check_mk/apache.conf

@@ -54,10 +54,10 @@ WSGIRestrictSignal Off
 # Initialize the Checkmk application when starting a new apache process with a
 # new interpreter to prevent initializations during handling of the first HTTP
 # request
-WSGIImportScript ###ROOT###/lib/python3/cmk/gui/wsgi/wsgi_import.py process-group=%{GLOBAL} application-group=%{GLOBAL}
+WSGIImportScript ###ROOT###/lib/python###PYTHON_MAJOR_MINOR###/site-packages/cmk/gui/wsgi/wsgi_import.py process-group=%{GLOBAL} application-group=%{GLOBAL}
 
-AliasMatch ^/###SITE###/check_mk/($|api/.*|[a-z_-]+\.py) ###ROOT###/lib/python3/cmk/gui/wsgi/applications/index.wsgi
-<Directory ###ROOT###/lib/python3/cmk/gui/wsgi/applications>
+AliasMatch ^/###SITE###/check_mk/($|api/.*|[a-z_-]+\.py) ###ROOT###/lib/python###PYTHON_MAJOR_MINOR###/site-packages/cmk/gui/wsgi/applications/index.wsgi
+<Directory ###ROOT###/lib/python###PYTHON_MAJOR_MINOR###/site-packages/cmk/gui/wsgi/applications>
     SetHandler wsgi-script
     Options +ExecCGI
 

omd/packages/omd/omdlib/contexts.py

@@ -5,6 +5,7 @@
 
 
 import os
+import sys
 from pathlib import Path
 
 from omdlib.init_scripts import check_status
@@ -61,6 +62,7 @@ def replacements(self) -> Replacements:
             "###SITE###": self.name,
             "###ROOT###": self._paths.home,
             "###EDITION###": version.split(".")[-1],
+            "###PYTHON_MAJOR_MINOR###": f"{sys.version_info.major}.{sys.version_info.minor}",
         }
 
     def set_config(self, config: Config) -> None:

omd/packages/omd/omdlib/main.py

@@ -408,6 +408,7 @@ def patch_skeleton_files(
         "###SITE###": old_site_name,
         "###ROOT###": SitePaths.from_site_name(old_site_name).home,
         "###EDITION###": new_replacements["###EDITION###"],
+        "###PYTHON_MAJOR_MINOR###": new_replacements["###PYTHON_MAJOR_MINOR###"],
     }
     skelroot = "/omd/versions/%s/skel" % omdlib.__version__
     with contextlib.chdir(skelroot):  # make relative paths
@@ -925,19 +926,22 @@ def update_file(
     new_skel = "/omd/versions/%s/skel" % new_version
 
     site_home = SitePaths.from_site_name(site.name).home
+    python_major_minor = f"{sys.version_info.major}.{sys.version_info.minor}"
     new_replacements = {
         "###SITE###": site.name,
         "###ROOT###": site_home,
         # When calling this during "omd update", the site.version and site.edition still point to
         # the original edition, because we are still in the update prcedure and the version symlink
         # has not been changed yet.
         "###EDITION###": new_edition,
+        "###PYTHON_MAJOR_MINOR###": python_major_minor,
     }
 
     old_replacements = {
         "###SITE###": site.name,
         "###ROOT###": site_home,
         "###EDITION###": old_edition,
+        "###PYTHON_MAJOR_MINOR###": python_major_minor,
     }
 
     old_path = old_skel + "/" + relpath

tests/integration/omd/test_python.py

@@ -210,8 +210,8 @@ def test_python_optimized_and_lto_enable(site: Site) -> None:
     [
         pytest.param(
             "cmk.base.config",
-            f"lib/python{PYVER.major}/cmk/base/config.py",
-            f"lib/python{PYVER.major}/cmk/base/__pycache__/config.cpython-{PYVER.major}{PYVER.minor}.pyc",
+            f"lib/python{PYVER.major}.{PYVER.minor}/site-packages/cmk/base/config.py",
+            f"lib/python{PYVER.major}.{PYVER.minor}/site-packages/cmk/base/__pycache__/config.cpython-{PYVER.major}{PYVER.minor}.pyc",
             id="pyc for imports from the big monolith cmk namespace",
         ),
         pytest.param(

tests/unit/omdlib/test_site_context.py

@@ -5,6 +5,7 @@
 
 
 import os
+import sys
 
 import pytest
 
@@ -27,4 +28,7 @@ def test_site_context_replacements(monkeypatch: pytest.MonkeyPatch) -> None:
     assert replacements["###SITE###"] == "dingeling"
     assert replacements["###ROOT###"] == "/omd/sites/dingeling"
     assert replacements["###EDITION###"] == "pro"
-    assert len(replacements) == 3
+    assert (
+        replacements["###PYTHON_MAJOR_MINOR###"]
+        == f"{sys.version_info.major}.{sys.version_info.minor}"
+    )