Skip to content

test(suites): port the universal conformance suites onto testkit and run them from the plan - #4774

Draft
matthewgrossman wants to merge 6 commits into
test/3954-first-testkit-lane/matthewgrossmanfrom
test/3954-migrate-suites-to-testkit/matthewgrossman
Draft

matthewgrossman wants to merge 6 commits into
test/3954-first-testkit-lane/matthewgrossmanfrom
test/3954-migrate-suites-to-testkit/matthewgrossman

Conversation

@matthewgrossman

@matthewgrossman matthewgrossman commented Oct 20, 2026 •

Copy link
Copy Markdown
Member

Summary

Ports the universal conformance suites (CLI, lifecycle, file-transfer, persistent-workspace) onto testkit and runs them from the cpu-tests plan on Docker, Podman (rootful and rootless) and k3s (single and HA). This is PR 2 of the plan in conformance-plan.md, stacked on the runner.

It adds the new suites without removing anything: the old suites, the hand-written release lanes (conformance-integration) and the old crates are untouched. Switching conformance-integration to the runner, and deleting the old CLI suite, is PR 3, after each environment has been shown green here a few times.

The lifecycle, persistent-workspace and file-transfer ports start from @elezar's draft #4629.

Stack

Part of a stack; each PR targets the one below it. The tmachine move (#4726) and the testkit library (#4724) have merged.

  1. feat(runner): add the test runner, plans and tmachine Session API, and run a plan on CI #4773: the test runner, plans, tmachine Session API and a smoke suite running on CI.
  2. test(suites): port the universal conformance suites onto testkit and run them from the plan #4774: ports the universal conformance suites and runs them in the plan on five environments.

Still to come: (3) ship openshell-conformance as one program with testkit::main(), point the host lanes at it, delete the old CLI suite and switch conformance-integration to the runner; (4) migrate features and drivers (oci-image, Keycloak providers, Podman userns, e2e-podman) and delete crates/openshell-conformance.

Related Issue

Part of #3954

Changes

  • tests/suites/conformance/sandbox: test files lifecycle, cli, persistent_workspace and file_transfer next to smoke. persistent_workspace_survives_stop_start stays in conformance: every conformant driver keeps the workspace across stop and start (MXC isn't conformant until it can restart a stopped sandbox).
  • cx.track and cx.adopt in testkit, for sandboxes a test creates through the CLI.
  • tests/environments: adds Podman (Fedora 44, rootful and rootless, RPM) and k3s and HA k3s (Ubuntu 24.04), amd64 only.
  • tests/plans/cpu-tests.yaml: the whole conformance family on all five environments.
  • Plan validation: a conformance entry must select the same suites in every environment, or the runner refuses the plan and names the environments that differ.
  • The k3s installer now waits for the Agent Sandbox controller to reconcile (k3s-controller-ready.yaml, moved out of the old conformance playbook, which includes it too). Tests don't wait for it.
  • e2e-suites.yml: the tmachine disk cache is keyed per environment. The k3s environments skip the cache, as integration-runner.yml does; its history doesn't say why, so that is still to find out.
  • Git is installed in every tmachine test environment (test-tools.yaml), for the .gitignore filtering test.

Old test to new test

Old New Notes
smoke (scenario: status, create, get Ready, list, exec, delete, list empty) sandbox/tests/cli.rs::cli_create_exec_list_delete Same CLI steps. smoke.rs::create_exec_delete is the SDK variant (in #4773).
sandbox_lifecycle stop_start_preserves_workspace persistent_workspace.rs::persistent_workspace_survives_stop_start (SDK) and cli.rs::cli_stop_start_delete (CLI) Also lifecycle.rs::restart_stopped_sandbox.
sandbox_lifecycle stopped_can_be_deleted lifecycle.rs::stopped_sandbox_can_be_deleted Also at the end of cli_stop_start_delete.
file_transfer::round_trip file_transfer.rs::upload_download_round_trip
file_transfer::git_filtering file_transfer.rs::upload_respects_gitignore Needs git where the tests run.
file_transfer::path_safety file_transfer.rs::download_stays_inside_workspace

New with no old counterpart (from #4629): lifecycle.rs::long_running_exec_delete, run_to_completion_exit_delete, default_command_sandbox_is_listed_ready.

policy_advisor has no port: it is a filter (binary(policy_advisor)) over existing conformance tests that no workflow runs, so it goes with the old suite.

Not in this PR

Testing

  • Checks appropriate to the affected code and behavior pass
    • Locally: fmt, clippy, the runner tests (48), testkit and lockfile alignment checks, and the plan dry run listing the suites in all five environments.
    • On CI: a Branch E2E workflow_dispatch on this head is running; results will be posted here. The ports passed on Docker on an earlier head (21 tests); Podman and k3s have not run through the runner yet.
  • Unit tests added/updated
  • E2E tests added/updated

Checklist

  • Follows Conventional Commits
  • Commits are signed off (DCO)
  • Architecture docs updated (TESTING.md, tests/plans/README.md)

🤖 Generated with Claude Code

@copy-pr-bot

copy-pr-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

@matthewgrossman
matthewgrossman added this pull request to stack #4776 October 20, 2026 23:38
@github-actions

Copy link
Copy Markdown

@copy-pr-bot

copy-pr-bot Bot commented Oct 21, 2026

Copy link
Copy Markdown

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch 2 times, most recently from 6d64703 to e3d9f01 Compare October 21, 2026 20:40
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from e3d9f01 to 5e2cbc5 Compare October 21, 2026 20:49
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 5e2cbc5 to cda205f Compare October 21, 2026 23:45
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from cda205f to 7c75fbf Compare October 22, 2026 04:51
@matthewgrossman
matthewgrossman removed this pull request from stack #4776 October 22, 2026 04:51
@matthewgrossman
matthewgrossman added this pull request to stack #4824 October 22, 2026 04:51
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 7c75fbf to bb39723 Compare October 22, 2026 05:29
@matthewgrossman matthewgrossman changed the title test(suites): move the conformance, oci-image, provider-refresh and podman suites to testkit test(suites): port the old suites onto testkit and run them from the plan Oct 22, 2026
@matthewgrossman
matthewgrossman removed this pull request from stack #4824 October 22, 2026 05:29
@matthewgrossman
matthewgrossman added this pull request to stack #4825 October 22, 2026 05:30
@matthewgrossman
matthewgrossman removed this pull request from stack #4825 October 22, 2026 16:01
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from bb39723 to 1cb1dc8 Compare October 22, 2026 16:01
@matthewgrossman
matthewgrossman added this pull request to stack #4836 October 22, 2026 16:01
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 1cb1dc8 to fbcd389 Compare October 22, 2026 16:37
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from fbcd389 to 986fdcf Compare October 22, 2026 16:58
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 986fdcf to 2fdcd59 Compare October 22, 2026 17:31
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 2fdcd59 to 33b8dc1 Compare October 23, 2026 00:01
@matthewgrossman matthewgrossman changed the title test(suites): port the old suites onto testkit and run them from the plan test(suites): port the universal conformance suites onto testkit and run them from the plan Oct 23, 2026
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 33b8dc1 to db85da9 Compare October 23, 2026 03:37
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from db85da9 to 6f5c621 Compare October 23, 2026 04:00
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from 6f5c621 to b9e6bfe Compare October 23, 2026 04:46
matthewgrossman and others added 6 commits October 22, 2026 22:29
Add cx.track and cx.adopt, so a test that creates a sandbox through the CLI
still cleans it up after a failure: track the name before the command, adopt it
afterwards for an SDK handle.

Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
…ent-workspace suites to testkit

Add the lifecycle, cli, persistent_workspace and file_transfer test files to the
sandbox crate. The lifecycle, persistent-workspace and file-transfer tests are
adapted from #4629. persistent_workspace_survives_stop_start
stays in conformance: every conformant driver keeps the workspace across stop
and start, and the one that can't yet (MXC) isn't conformant until it can.

The policy-advisor suite needs no port: it is a filter over the existing
conformance tests that no workflow runs. The OCI image, Keycloak and Podman
userns suites are ported separately, in the features and drivers families. The
old conformance/cli crate stays until the release lanes move to plans.

Co-authored-by: Evan Lezar <elezar@nvidia.com>
Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
The file-transfer suite builds a Git repository on the machine that runs the tests, and the old conformance playbook installed Git itself.

Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
The k3s installer now waits until the Agent Sandbox controller reconciles a
gated probe Sandbox, so a test that starts right after boot doesn't race it.
The check moves out of the old conformance playbook into
tests/tmachine/ansible/playbooks/k3s-controller-ready.yaml, which the installer
and the old playbook both include. Tests themselves don't wait for the controller.

Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
A plan can't run part of the conformance family in one environment and a
different part in another, or conformance would mean different things in
different places. The runner refuses such a plan and names the environments
that differ. A test that can't pass everywhere belongs in another family.

Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
Add the Podman (rootful and rootless, RPM) and k3s and HA k3s environments and
put them, with Docker, in the cpu-tests plan, which now runs the whole
conformance family (smoke, lifecycle, cli, persistent-workspace and
file-transfer) on all five. The tmachine disk cache in e2e-suites.yml is keyed
per environment; the k3s environments skip it as integration-runner.yml does.
The old suites and lanes still run unchanged. arm64 is not defined.

Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
@matthewgrossman
matthewgrossman force-pushed the test/3954-migrate-suites-to-testkit/matthewgrossman branch from b9e6bfe to 919f767 Compare October 23, 2026 05:30

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant