ceph-devstack 0.2.1__tar.gz → 0.3.0__tar.gz

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     name: Check code style
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
       - name: Install precommit
         run: pip install pre-commit
       - name: Check lint
@@ -26,8 +26,10 @@ jobs:
         include:
           - os: ubuntu-24.04
             python: "3.12"
+          - os: ubuntu-26.04
+            python: "3.14"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
       - name: Install packages
         run: sudo apt-get update && sudo apt-get install podman golang-github-containernetworking-plugin-dnsname sqlite3 jq
       - name: Install uv
@@ -53,9 +55,12 @@ jobs:
         run: podman exec testnode_0 journalctl
       - name: Wait
         run: uv run ceph-devstack wait teuthology
-      - name: Dump logs
+      - name: Dump dispatcher log
         if: success() || failure()
         run: podman logs -f teuthology
+      - name: Dump job log
+        if: success() || failure()
+        run: uv run ceph-devstack logs
       - name: Create archive
         if: success() || failure()
         run: |
@@ -67,7 +72,7 @@ jobs:
           sqlite3 /tmp/dev.db ".output stdout" ".mode json" "select * from jobs" | jq | tee /tmp/artifacts/jobs.json
       - name: Upload jobs.json
         if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: jobs
           path: /tmp/artifacts/jobs.json
@@ -77,7 +82,7 @@ jobs:
           tar -czf /tmp/artifacts/archive.tar ~/.local/share/ceph-devstack/archive/
       - name: Upload log archive
         if: success() || failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: archive
           path: /tmp/artifacts/archive.tar

ceph_devstack-0.2.1/.github/workflows/tox.yml → ceph_devstack-0.3.0/.github/workflows/pytest.yml

@@ -1,4 +1,4 @@
-name: tox
+name: pytest
 
 on:
   pull_request:
@@ -8,26 +8,22 @@ on:
 
 jobs:
   test:
-    name: tox on python${{ matrix.python }} via ${{ matrix.os }}
+    name: pytest on python${{ matrix.python }} via ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
-          - os: ubuntu-22.04
-            python: "3.10"
-          - os: ubuntu-22.04
-            python: "3.11"
           - os: ubuntu-24.04
             python: "3.12"
-          - os: ubuntu-24.04
-            python: "3.13"
+          - os: ubuntu-26.04
+            python: "3.14"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6.3.0
         with:
           python-version: ${{ matrix.python }}
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       - name: Run unit tests
-        run: uv run --extra test tox
+        run: uv run --all-extras pytest

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install uv
         uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
       - name: Install Python 3.13

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ceph-devstack
-Version: 0.2.1
+Version: 0.3.0
 Summary: Run a full teuthology lab on your laptop!
 Author-email: Zack Cerza <zack@cerza.org>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack/__init__.py

@@ -50,6 +50,8 @@ def parse_args(args: List[str]) -> argparse.Namespace:
     parser_config_set = subparsers_config.add_parser("set")
     parser_config_set.add_argument("name")
     parser_config_set.add_argument("value")
+    parser_config_unset = subparsers_config.add_parser("unset")
+    parser_config_unset.add_argument("name")
     parser_doc = subparsers.add_parser(
         "doctor", help="Check that the system meets requirements"
     )
@@ -129,6 +131,8 @@ class Config(dict):
     __slots__ = ["user_obj", "user_path"]
 
     def load(self, config_path: Path | None = None):
+        args = self.get("args")
+        self.clear()
         parsed = tomlkit.parse((Path(__file__).parent / "config.toml").read_text())
         self.update(parsed)
         if config_path:
@@ -140,6 +144,8 @@ class Config(dict):
                 raise OSError(f"Config file at {self.user_path} not found!")
             else:
                 self.user_obj = {}
+        if args:
+            self["args"] = args
 
     def dump(self):
         return tomlkit.dumps(self)
@@ -153,14 +159,14 @@ class Config(dict):
             try:
                 obj = obj[sub_path]
             except KeyError:
-                logger.error(f"{name} not found in config")
-                raise
+                logger.debug(f"{name} not found in config")
+                return ""
             i += 1
         if isinstance(obj, (str, int, bool)):
             return str(obj)
         return tomlkit.dumps(obj).strip()
 
-    def set_value(self, name: str, value: str) -> None:
+    def set_value(self, name: str, value: str) -> str:
         path = name.split(".")
         obj = self.user_obj
         i = 0
@@ -181,6 +187,25 @@ class Config(dict):
                 self.user_path.parent.mkdir(exist_ok=True)
                 self.user_path.write_text(tomlkit.dumps(self.user_obj).strip())
             i += 1
+        return str(item)
+
+    def unset_value(self, name: str) -> None:
+        path = name.split(".")
+        obj = self.user_obj
+        i = 0
+        last_index = len(path) - 1
+        while i <= last_index:
+            if i < last_index:
+                if path[i] not in obj:
+                    break
+                obj = obj[path[i]]
+            elif i == last_index:
+                obj.pop(path[i])
+                self.update(self.user_obj)
+                self.user_path.parent.mkdir(exist_ok=True)
+                self.user_path.write_text(tomlkit.dumps(self.user_obj).strip())
+            i += 1
+        self.load(self.user_path)
 
 
 config = Config()

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack/cli.py

@@ -12,6 +12,7 @@ CONFIG_HANDLERS = {
     "dump": lambda config, args: print(config.dump()),
     "get": lambda config, args: print(config.get_value(args.name)),
     "set": lambda config, args: print(config.set_value(args.name, args.value)),
+    "unset": lambda config, args: config.unset_value(args.name),
 }
 
 COMMAND_HANDLERS = {

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack/requirements.py

@@ -1,6 +1,5 @@
 import shlex
 
-from pathlib import Path
 from packaging.version import parse as parse_version, Version
 from typing import List
 
@@ -161,7 +160,9 @@ class PodmanVersion(Requirement):
         return True
 
 
-class PodmanRuntime(Requirement):
+class PodmanRuntime(FixableRequirement):
+    suggest_msg = "Could not find the 'crun' container runtime"
+
     @property
     def fix_cmd(self):
         if self.host.os_type != "darwin":
@@ -170,19 +171,8 @@ class PodmanRuntime(Requirement):
 
     async def check(self):
         podman_info = await self.host.podman_info()
-        storage_conf_path = podman_info["store"]["configFile"]
         runtime = podman_info["host"]["ociRuntime"]["name"]
-        if runtime == "crun":
-            return True
-        else:
-            containers_conf_path = Path(storage_conf_path).parent / "containers.conf"
-            cmd = host.cmd(["podman", "system", "reset"])
-            logger.error(
-                f"The configured runtime is '{runtime}'. "
-                f"It must be set to 'crun' in {containers_conf_path}. "
-                f"Afterward, run '{cmd}'."
-            )
-            return False
+        return runtime == "crun"
 
 
 class SELinuxBoolean(FixableRequirement):

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack/resources/ceph/__init__.py

@@ -24,8 +24,7 @@ from ceph_devstack.resources.ceph.requirements import (
     LoopControlDeviceWriteable,
     SELinuxModule,
 )
-from ceph_devstack.resources.ceph.utils import get_most_recent_run, get_job_id
-from ceph_devstack.resources.ceph.exceptions import TooManyJobsFound
+from ceph_devstack.resources.ceph.utils import get_runs, get_jobs
 
 
 class SSHKeyPair(Secret):
@@ -236,29 +235,31 @@ class CephDevStack:
             log_file = self.get_log_file(run_name, job_id)
         except FileNotFoundError:
             logger.error("No log file found")
-        except TooManyJobsFound as e:
-            msg = "Found too many jobs ({jobs}) for target run. Please pick a job id with -j option.".format(
-                jobs=", ".join(e.jobs)
-            )
-            logger.error(msg)
         else:
             if locate:
-                print(log_file)
+                print(str(log_file).replace(str(pathlib.Path.home()), "~"))
             else:
                 buffer_size = 8 * 1024
                 with open(log_file) as f:
                     while chunk := f.read(buffer_size):
                         print(chunk, end="")
 
-    def get_log_file(self, run_name: str = "", job_id: str = ""):
-        archive_dir = Teuthology().archive_dir.expanduser()
+    def get_log_file(self, run_name: str = "", job_id: str = "") -> pathlib.Path:
+        archive_dir = Teuthology().archive_dir
 
         if not run_name:
-            run_name = get_most_recent_run(os.listdir(archive_dir))
-        run_dir = archive_dir.joinpath(run_name)
+            runs = get_runs(archive_dir)
+            if not runs:
+                raise FileNotFoundError
+            run_dir = runs[0]
+        else:
+            run_dir = archive_dir.joinpath(run_name)
 
         if not job_id:
-            job_id = get_job_id(os.listdir(run_dir))
+            jobs = get_jobs(run_dir)
+            if not jobs:
+                raise FileNotFoundError
+            job_id = jobs[0].name
 
         log_file = run_dir.joinpath(job_id, "teuthology.log")
         if not log_file.exists():

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack/resources/ceph/containers.py

@@ -411,7 +411,7 @@ class Teuthology(Container):
     }
 
     @property
-    def archive_dir(self):
+    def archive_dir(self) -> Path:
         return Path(config["data_dir"]) / "archive"
 
     async def create(self):

ceph_devstack-0.3.0/ceph_devstack/resources/ceph/utils.py

@@ -0,0 +1,38 @@
+import pathlib
+import re
+from datetime import datetime
+from typing import List
+
+RUN_DIRNAME_PATTERN = re.compile(
+    r"^(?P<username>^[a-z_]([a-z0-9_-]{0,31}|[a-z0-9_-]{0,30}))-(?P<timestamp>\d{4}-\d{2}-\d{2}_\d{2}:\d{2}:\d{2})"
+)
+
+
+def get_logtimestamp(dirname: str) -> datetime:
+    match_ = RUN_DIRNAME_PATTERN.search(dirname)
+    assert match_
+    return datetime.strptime(match_.group("timestamp"), "%Y-%m-%d_%H:%M:%S")
+
+
+def get_runs(directory: pathlib.Path) -> List[pathlib.Path]:
+    return sorted(
+        (
+            dir_
+            for dir_ in directory.expanduser().absolute().iterdir()
+            if RUN_DIRNAME_PATTERN.search(dir_.name)
+        ),
+        key=lambda dir_: dir_.stat().st_mtime,
+        reverse=True,
+    )
+
+
+def get_jobs(directory: pathlib.Path) -> List[pathlib.Path]:
+    return sorted(
+        (
+            dir_
+            for dir_ in directory.expanduser().absolute().iterdir()
+            if str(dir_.name).isdigit()
+        ),
+        key=lambda dir_: dir_.stat().st_mtime,
+        reverse=True,
+    )

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ceph-devstack
-Version: 0.2.1
+Version: 0.3.0
 Summary: Run a full teuthology lab on your laptop!
 Author-email: Zack Cerza <zack@cerza.org>
 License-Expression: MIT
@@ -11,7 +11,7 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: packaging

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/ceph_devstack.egg-info/SOURCES.txt

@@ -6,13 +6,11 @@ LICENSE
 README.md
 build_selinux_module.sh
 pyproject.toml
-pytest.ini
 ruff.toml
-tox.ini
 uv.lock
 .github/workflows/ci.yml
+.github/workflows/pytest.yml
 .github/workflows/release.yml
-.github/workflows/tox.yml
 ceph_devstack/Dockerfile.selinux
 ceph_devstack/__init__.py
 ceph_devstack/ceph_devstack.pp
@@ -29,13 +27,14 @@ ceph_devstack.egg-info/SOURCES.txt
 ceph_devstack.egg-info/dependency_links.txt
 ceph_devstack.egg-info/entry_points.txt
 ceph_devstack.egg-info/requires.txt
+ceph_devstack.egg-info/scm_file_list.json
+ceph_devstack.egg-info/scm_version.json
 ceph_devstack.egg-info/top_level.txt
 ceph_devstack/resources/__init__.py
 ceph_devstack/resources/container.py
 ceph_devstack/resources/misc.py
 ceph_devstack/resources/ceph/__init__.py
 ceph_devstack/resources/ceph/containers.py
-ceph_devstack/resources/ceph/exceptions.py
 ceph_devstack/resources/ceph/requirements.py
 ceph_devstack/resources/ceph/utils.py
 docs/cgroup_v2.md

ceph_devstack-0.3.0/ceph_devstack.egg-info/scm_file_list.json

@@ -0,0 +1,55 @@
+{
+  "files": [
+    "Jenkinsfile",
+    "build_selinux_module.sh",
+    ".pre-commit-config.yaml",
+    "README.md",
+    "uv.lock",
+    "LICENSE",
+    "pyproject.toml",
+    "ruff.toml",
+    ".gitignore",
+    ".flake8",
+    "docs/cgroup_v2.md",
+    "ceph_devstack/py.typed",
+    "ceph_devstack/__init__.py",
+    "ceph_devstack/ceph_devstack.te",
+    "ceph_devstack/ceph_devstack.pp",
+    "ceph_devstack/logging.conf",
+    "ceph_devstack/exec.py",
+    "ceph_devstack/host.py",
+    "ceph_devstack/config.toml",
+    "ceph_devstack/cli.py",
+    "ceph_devstack/Dockerfile.selinux",
+    "ceph_devstack/requirements.py",
+    "ceph_devstack/resources/__init__.py",
+    "ceph_devstack/resources/container.py",
+    "ceph_devstack/resources/misc.py",
+    "ceph_devstack/resources/ceph/containers.py",
+    "ceph_devstack/resources/ceph/__init__.py",
+    "ceph_devstack/resources/ceph/utils.py",
+    "ceph_devstack/resources/ceph/requirements.py",
+    "tests/test_config.py",
+    "tests/__init__.py",
+    "tests/test_requirements_core.py",
+    "tests/test_deep_merge.py",
+    "tests/conftest.py",
+    "tests/test_parse_args.py",
+    "tests/resources/__init__.py",
+    "tests/resources/test_podmanresource.py",
+    "tests/resources/test_misc.py",
+    "tests/resources/test_container.py",
+    "tests/resources/ceph/test_env_vars.py",
+    "tests/resources/ceph/__init__.py",
+    "tests/resources/ceph/test_devstack.py",
+    "tests/resources/ceph/test_ssh_keypair.py",
+    "tests/resources/ceph/test_cephdevstack_core.py",
+    "tests/resources/ceph/test_testnode.py",
+    "tests/resources/ceph/test_requirements_ceph.py",
+    "tests/resources/ceph/fixtures/__init__.py",
+    "tests/resources/ceph/fixtures/testnode-config.toml",
+    ".github/workflows/release.yml",
+    ".github/workflows/pytest.yml",
+    ".github/workflows/ci.yml"
+  ]
+}

ceph_devstack-0.3.0/ceph_devstack.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.3.0",
+  "distance": 0,
+  "node": "g74b5f8b0878922261edc5ba01b8937dc4bd02d7c",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-26"
+}

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/pyproject.toml

@@ -12,7 +12,7 @@ classifiers = [
 ]
 keywords = ["podman", "ceph"]
 description = "Run a full teuthology lab on your laptop!"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = ["packaging", "pre-commit", "PyYAML", "tomlkit"]
 dynamic = ["version"]
 
@@ -45,3 +45,8 @@ requires = [
     "wheel",
     "setuptools-scm>=8",
 ]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"

ceph_devstack-0.3.0/tests/conftest.py

@@ -0,0 +1,43 @@
+import os
+import pathlib
+import pytest
+import random
+
+from datetime import datetime, timedelta
+
+from ceph_devstack import config
+
+
+@pytest.fixture(autouse=True)
+def reset_config():
+    config.load()
+    yield
+
+
+@pytest.fixture(scope="function")
+def create_log_file():
+    def _create_log_file(data_dir: pathlib.Path, **kwargs) -> pathlib.Path:
+        parts = {
+            "timestamp": (datetime.now() - timedelta(days=random.randint(1, 100))),
+            "test_type": random.choice(["ceph", "rgw", "rbd", "mds"]),
+            "job_id": random.randint(1, 100),
+            "content": "some log data",
+            **kwargs,
+        }
+        timestamp = parts["timestamp"].strftime("%Y-%m-%d_%H:%M:%S")
+        test_type = parts["test_type"]
+        job_id = parts["job_id"]
+        content = parts["content"]
+
+        run_name = f"root-{timestamp}-orch:cephadm:{test_type}-small-main-distro-default-testnode"
+        log_dir = data_dir / "archive" / run_name / str(job_id)
+
+        os.makedirs(log_dir, exist_ok=True)
+        time_ = parts["timestamp"].timestamp()
+        os.utime(log_dir, times=(time_, time_))
+        log_file = log_dir / "teuthology.log"
+        log_file.write_text(content)
+        os.utime(log_file, times=(time_, time_))
+        return log_file
+
+    return _create_log_file

{ceph_devstack-0.2.1 → ceph_devstack-0.3.0}/tests/resources/ceph/test_cephdevstack_core.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -13,7 +14,6 @@ from ceph_devstack.resources.ceph.containers import (
     TestNode as _TestNode,
     Teuthology,
 )
-from ceph_devstack.resources.ceph.exceptions import TooManyJobsFound
 
 
 class TestCephDevStackServiceSpecs:
@@ -205,46 +205,21 @@ class TestCephDevStackGetLogFile:
             with pytest.raises(FileNotFoundError):
                 devstack.get_log_file(run_name, "1")
 
-    def test_get_log_file_uses_most_recent_when_no_run_name(self, tmp_path):
+    def test_get_log_file_uses_most_recent_when_no_run_name(
+        self, tmp_path, create_log_file
+    ):
+        config["data_dir"] = str(tmp_path)
+        create_log_file(
+            tmp_path, timestamp=datetime(year=2024, month=1, day=1), content="old log"
+        )
+        new_log_file = create_log_file(
+            tmp_path, timestamp=datetime(year=2025, month=1, day=1), content="new log"
+        )
         devstack = CephDevStack()
-        archive_dir = tmp_path / "archive"
-        archive_dir.mkdir()
-
-        # Create two runs
-        older_run = "root-2024-01-01_00:00:00-orch:cephadm:smoke-small-main-distro-default-testnode"
-        newer_run = "root-2025-01-01_00:00:00-orch:cephadm:smoke-small-main-distro-default-testnode"
-
-        older_dir = archive_dir / older_run
-        older_dir.mkdir()
-        older_job = older_dir / "1"
-        older_job.mkdir()
-        (older_job / "teuthology.log").write_text("old log")
-
-        newer_dir = archive_dir / newer_run
-        newer_dir.mkdir()
-        newer_job = newer_dir / "1"
-        newer_job.mkdir()
-        log_file = newer_job / "teuthology.log"
-        log_file.write_text("new log")
-
-        # Override listdir behavior
-        def mock_listdir(path):
-            if str(path) == str(archive_dir):
-                return [older_run, newer_run]
-            if str(path) == str(newer_dir):
-                return ["1"]
-            return []
-
-        with patch("ceph_devstack.resources.ceph.Teuthology") as MockTeuthology:
-            mock_teuthology = MagicMock()
-            mock_teuthology.archive_dir = archive_dir
-            MockTeuthology.return_value = mock_teuthology
+        result = devstack.get_log_file("", "")
+        assert str(result) == str(new_log_file)
 
-            with patch("os.listdir", side_effect=mock_listdir):
-                result = devstack.get_log_file("", "")
-                assert str(result) == str(log_file)
-
-    def test_get_log_file_raises_too_many_jobs_when_multiple_and_no_job_id(
+    def test_get_log_file_returns_latest_job_log_when_multiple_and_no_job_id(
         self, tmp_path
     ):
         devstack = CephDevStack()
@@ -269,17 +244,7 @@ class TestCephDevStackGetLogFile:
             mock_teuthology = MagicMock()
             mock_teuthology.archive_dir = archive_dir
             MockTeuthology.return_value = mock_teuthology
-
-            def mock_listdir(path):
-                if str(path) == str(run_dir):
-                    return ["1", "2"]
-                return []
-
-            with (
-                patch("os.listdir", side_effect=mock_listdir),
-                pytest.raises(TooManyJobsFound),
-            ):
-                devstack.get_log_file(run_name, "")
+            assert devstack.get_log_file(run_name, "").parent.name == "2"
 
 
 class TestCephDevStackRemove: