Skip to content

openqa-bats-review: Update expected outside of loop #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Feb 10, 2026
Merged

openqa-bats-review: Update expected outside of loop #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0379db9
openqa-bats-review: Fix update of expected dict
ricardobranco777 Feb 10, 2026
ea10423
openqa-bats-review: Update podman_e2e value
ricardobranco777 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions openqa-bats-review
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,33 @@ def main(url: str, dry_run: bool = False) -> None:
"docker_rootless_testsuite": 12,
"docker_testsuite": 13,
"netavark_testsuite": 1,
"podman_e2e": 4,
"podman_e2e": 3,
"podman_rootless_e2e": 3,
"podman_testsuite": 4,
"runc_testsuite": 2,
"skopeo_testsuite": 2,
"umoci_testsuite": 2,
}

job_id = chain[0]
job = get_job(f"{openqa_host}/api/v1/jobs/{job_id}/details")
# We have more tests on Tumbleweed
if job["settings"]["DISTRI"] == "opensuse":
# For buildah we also run conformance tests
expected["buildah_testsuite"] += 1
# For conmon we also test crun as root & rootless
expected["conmon_testsuite"] += 2
# For containerd we also run the critest
expected["containerd_testsuite"] += 1
expected["docker_testsuite"] += 6
# We also run the remoteintegration test for crun, skip it for runc
if job["settings"].get("OCI_RUNTIME") == "crun":
expected["podman_e2e"] += 1
# For skopeo we also run Golang integration tests
expected["skopeo_testsuite"] += 1
elif job["settings"]["DISTRI"] == "sle" and job["settings"]["VERSION"].startswith("16."):
expected["docker_testsuite"] += 6

all_failures = []

for job_id in chain:
Expand All @@ -216,22 +235,9 @@ def main(url: str, dry_run: bool = False) -> None:
if testsuite.endswith("_crun"):
testsuite = testsuite[: -len("_crun")]

# We have more tests on Tumbleweed
if job["settings"]["DISTRI"] == "opensuse":
# For buildah we also run conformance tests
expected["buildah_testsuite"] += 1
# For conmon we also test crun as root & rootless
expected["conmon_testsuite"] += 2
# For containerd we also run the critest
expected["containerd_testsuite"] += 1
expected["docker_testsuite"] += 6
# For skopeo we also run Golang integration tests
expected["skopeo_testsuite"] += 1
elif job["settings"]["DISTRI"] == "sle" and job["settings"]["VERSION"].startswith("16."):
expected["docker_testsuite"] += 6

if len(logs) != expected[testsuite]:
log.info("Job %s has only %d logs, skipping", job_id, len(logs))
log.info("Job %s has only %d logs (expected: %d for %s), skipping",
job_id, len(logs), expected[testsuite], testsuite)
continue

failed = process_logs(logs)
Expand Down
2 changes: 0 additions & 2 deletions tests/test_openqa_bats_review.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ def job_resp(url: str) -> dict[str, Any]:
with pytest.raises(SystemExit) as exc:
bats_review.main("http://openqa.example.com/tests/123", dry_run=True)
assert exc.value.code == 0
mock_log.info.assert_any_call("Job %s has only %d logs, skipping", 123, 2)
mock_log.info.assert_any_call("Job %s has only %d logs, skipping", 122, 2)
mock_log.info.assert_any_call("No logs found in chain. Exiting")


Expand Down