Migrate integration tests to Jubilant

python-libjuju is in maintenance only and its series map has no 26.04,
so deploys on ubuntu@26.04 fail. Jubilant drives the juju CLI, which
resolves the base and knows 26.04, so drop the libjuju revision pin.

Signed-off-by: Seyeong Kim <seyeong.kim@canonical.com>

Author: xtrusia

tests/integration/conftest.py

@@ -16,11 +16,12 @@
 """Configure lldpd operator integration tests."""
 
 import logging
+import pathlib
 import platform
-from pathlib import Path
+import subprocess
 
+import jubilant
 import pytest
-from pytest_operator.plugin import OpsTest
 
 logger = logging.getLogger(__name__)
 
@@ -48,20 +49,25 @@ def charm_base(request) -> str:
 
 
 @pytest.fixture(scope="module")
-async def lldpd_charm(ops_test: OpsTest, charm_base: str) -> Path:
-    # Multiple charms will be built, but the build_charm function only returns
-    # the path to one of the charms. Find the charm that matches the charm_base
-    # in order to test the right one.
-    await ops_test.build_charm(".")
+def juju():
+    """Provide a temporary model, torn down at the end of the module."""
+    with jubilant.temp_model(config={"update-status-hook-interval": "10s"}) as juju:
+        yield juju
+
+
+@pytest.fixture(scope="module")
+def lldpd_charm(charm_base: str) -> pathlib.Path:
+    # charmcraft packs one file per platform. Build and return the charm that
+    # matches charm_base so the right one is tested.
+    subprocess.run(["charmcraft", "pack"], check=True)
 
     base = charm_base.replace("@", "-")
     arch = platform.machine()
     # convert the x86_64 arch into the amd64 arch used by charmcraft.
     if arch == "x86_64":
         arch = "amd64"
 
-    build_dir = (ops_test.tmp_path / "charms").absolute()
-    charm_file = build_dir / f"lldpd_{base}-{arch}.charm"
+    charm_file = pathlib.Path(f"lldpd_{base}-{arch}.charm").absolute()
     if not charm_file.exists():
         raise ValueError(f"Unable to find charm file {charm_file}")
 

tests/integration/test_charm.py

@@ -15,74 +15,39 @@
 
 """Test lldpd charm deployment."""
 
-import asyncio
 import logging
-import pytest
+import pathlib
 
-from pytest_operator.plugin import OpsTest
+import jubilant
+import pytest
 
 logger = logging.getLogger(__name__)
 
 NUM_UNITS = 2
 
-# The charmhub "ubuntu" charm is published as a separate revision per base, and
-# libjuju resolves the bare "ubuntu" name to the 24.04 revision regardless of the
-# requested base. Pin the latest/stable revision that matches each base so the
-# subordinate can be tested on every base. Refresh these if the charm is
-# republished (charmhub.io/ubuntu, Releases tab).
-UBUNTU_REVISION = {
-    "ubuntu@20.04": 26,
-    "ubuntu@22.04": 77,
-    "ubuntu@24.04": 79,
-    "ubuntu@26.04": 81,
-}
 
-
-@pytest.mark.abort_on_fail
-@pytest.mark.skip_if_deployed
 @pytest.mark.order(1)
-async def test_build_and_deploy(
-    ops_test: OpsTest, charm_base: str, lldpd_charm
+def test_build_and_deploy(
+    juju: jubilant.Juju, charm_base: str, lldpd_charm: pathlib.Path
 ) -> None:
     """Test the lldpd charm builds and deploys."""
     logger.info(f"Building and deploying lldp charms for base: {charm_base}")
-    lldpd = lldpd_charm
-
-    logger.info(f"lldpd charm is located at: {lldpd}")
+    logger.info(f"lldpd charm is located at: {lldpd_charm}")
 
-    # Deploy ubuntu and lldpd charms.
-    await asyncio.gather(
-        ops_test.model.deploy(
-            "ubuntu",
-            application_name="ubuntu",
-            num_units=NUM_UNITS,
-            base=charm_base,
-            channel="latest/stable",
-            revision=UBUNTU_REVISION[charm_base],
-        ),
-        ops_test.model.deploy(
-            str(lldpd),
-            application_name="lldpd",
-            num_units=0,
-            base=charm_base,
-        ),
-    )
+    # Deploy the ubuntu principal and the lldpd subordinate. The juju CLI
+    # resolves the ubuntu charm revision for the requested base.
+    juju.deploy("ubuntu", "ubuntu", num_units=NUM_UNITS, base=charm_base)
+    juju.deploy(lldpd_charm, "lldpd", num_units=0, base=charm_base)
 
-    # Integrate lldpd with ubuntu
-    await ops_test.model.integrate("ubuntu:juju-info", "lldpd:juju-info")
-    async with ops_test.fast_forward():
-        await ops_test.model.wait_for_idle(
-            apps=["lldpd", "ubuntu"], status="active", timeout=1800
-        )
-        for unit in range(NUM_UNITS):
-            uname = f"lldpd/{unit}"
-            assert ops_test.model.units.get(uname).workload_status == "active"
+    juju.integrate("ubuntu:juju-info", "lldpd:juju-info")
+    juju.wait(jubilant.all_active, timeout=1800)
 
 
 @pytest.mark.order(2)
-async def test_lldpd_is_active(ops_test: OpsTest) -> None:
+def test_lldpd_is_active(juju: jubilant.Juju) -> None:
     """Test that the lldpd services are active in each juju unit."""
     logger.info("Validating that lldpd is active inside each juju unit.")
-    for unit in ops_test.model.applications["lldpd"].units:
-        status = (await unit.ssh("systemctl is-active lldpd")).strip()
-        assert status == "active", f"{unit.name} lldpd is not active"
+    status = juju.status()
+    for unit in status.apps["lldpd"].units:
+        result = juju.ssh(unit, "systemctl is-active lldpd").strip()
+        assert result == "active", f"{unit} lldpd is not active"

tox.ini

@@ -6,9 +6,6 @@ skipsdist=True
 skip_missing_interpreters = True
 envlist = lint, static-{charm,lib}, unit
 
-[pytest]
-asyncio_mode = auto
-
 [vars]
 src_path = {toxinidir}/src
 tst_path = {toxinidir}/tests
@@ -79,9 +76,8 @@ commands =
 [testenv:integration]
 description = Run integration tests
 deps =
-    juju<=3.6.0,>3.3.0
+    jubilant>=1.8,<2
     pytest
-    pytest-operator
     pytest-order
     -r{toxinidir}/requirements.txt
 commands =