fixup! ci: print group section lines for GitHub workflow

systemd · Mar 13, 2024 · 1edd167 · 1edd167
1 parent 3245c6f
commit 1edd167
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -174,8 +174,9 @@ jobs:
             --tb=no \
             --capture=no \
             --verbose \
-            --github-ci-sections \
             -m integration \
             --distribution ${{ matrix.distro }} \
             --tools-tree-distribution ${{ matrix.tools }} \
             tests/
+      env:
+        MKOSI_CI_SECTION: "github"
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -166,9 +166,11 @@ def suspend_capture_stdin(pytestconfig: Any) -> Iterator[None]:
 
 
 def begin_group(s: str) -> None:
-    print("", flush=True)
-    print(f"::group::{s}", flush=True)
+    if os.getenv("MKOSI_CI_SECTION") == "github":
+        print("", flush=True)
+        print(f"::group::{s}", flush=True)
 
 
 def end_group() -> None:
-    print("::endgroup::", flush=True)
+    if os.getenv("MKOSI_CI_SECTION") == "github":
+        print("::endgroup::", flush=True)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -38,11 +38,6 @@ def pytest_addoption(parser: Any) -> None:
         help="Pass --debug-shell when running mkosi",
         action="store_true",
     )
-    parser.addoption(
-        "--github-ci-sections",
-        help="Print GitHub Workflow section markers before and after each test",
-        action="store_true",
-    )
 
 
 @pytest.fixture(scope="session")
@@ -59,9 +54,6 @@ def config(request: Any) -> Image.Config:
 
 @pytest.fixture(autouse=True)
 def github_ci_sections(request: Any) -> Any:
-    if request.config.getoption("--github-ci-sections"):
-        begin_group(request.node.name)
-        yield
-        end_group()
-    else:
-        yield
+    begin_group(request.node.name)
+    yield
+    end_group()
diff --git a/tests/test_initrd.py b/tests/test_initrd.py
@@ -20,7 +20,7 @@
 from mkosi.user import INVOKING_USER
 from mkosi.versioncomp import GenericVersion
 
-from . import Image
+from . import Image, begin_group, end_group
 
 pytestmark = pytest.mark.integration
 
@@ -40,6 +40,12 @@ def passphrase() -> Iterator[Path]:
 
 @pytest.fixture(scope="module")
 def initrd(config: Image.Config) -> Iterator[Image]:
+    if config.tools_tree_distribution:
+        begin_group(f"Initrd image {config.distribution}/{config.release} (no tools tree)")
+    else:
+        begin_group(
+            f"Initrd image {config.distribution}/{config.release} using {config.tools_tree_distribution} tools tree"
+        )
     with Image(
         config,
         options=[
@@ -52,6 +58,7 @@ def initrd(config: Image.Config) -> Iterator[Image]:
 
         initrd.build()
         yield initrd
+    end_group()
 
 
 def test_initrd(initrd: Image) -> None: