Repository navigation
refactor(tests): move tmachine support files under tests/tmachine - #4726
Open
matthewgrossman wants to merge 3 commits into
Open
matthewgrossman wants to merge 3 commits into
matthewgrossman wants to merge 3 commits into
Conversation
Ansible, cloud-init, and the tmachine Nix config belong to tmachine, so they now live in tests/tmachine/ alongside the crate, which moves to tests/tmachine/cli/. tests/suites/ and tests/support/ are unchanged. tmachine still runs from the directory holding ansible/, so playbook paths stay the same; only inputs outside that directory gain a ../ prefix. The Nix build of tmachine and the base images are identical to before. Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
|
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. |
|
Label |
Member
Author
|
/ok to test 1584a9e |
The crate boots VMs, provisions them with Ansible, runs suites, and caches disks; the other entries in tests/tmachine/ are its config. Name the directory for that role rather than for the command-line entry point. Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
Member
Author
|
/ok to test d545087f84dcd85ccb8758f1b88bf4e8a87ba2c9 |
matthewgrossman
marked this pull request as ready for review
October 19, 2026 22:37
Put the crate back at tests/tmachine/, next to the Ansible and Nix config it uses, instead of in a subdirectory. Build tmachine from a fileset of Cargo.toml, Cargo.lock, and src/ so edits to that config do not rebuild the binary. Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
Member
Author
|
/ok to test e02d50d |
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Move tmachine's Ansible, cloud-init, and Nix config into
tests/tmachine/, next to the tmachine crate, which stays where it is.tests/suites/andtests/support/are unchanged. This is the first step in landing the conformance harness from #4629 incrementally.Related Issue
Closes #4725
Part of #3954
Changes
tests/{ansible,cloud-init,config.nix,images.nix,artifacts.nix}→tests/tmachine/. The crate (Cargo.toml,src/,default.nix) does not move.tests/tmachine/default.nixbuilds from a fileset ofCargo.toml,Cargo.lock, andsrc/, so edits to the Ansible and Nix config beside it do not rebuild tmachine.ansible/, so playbook paths are unchanged. Inputs outside it gain one../: artifacts,e2e/,scripts/, and the Podman fixtures intests/suites/.flake.nix,artifacts.nix(vm-runtime path), the failure-onlyopenshell_diagnosticsoutput path,test-packaging-assets.sh,.gitignore, andTESTING.md.The base image derivations are identical to
main. The tmachine binary rebuilds once because its Nix source is now a fileset. The diagnostics role change alters the Ansible hash that keys tmachine's disk cache, so cached install and test layers miss.Testing
cargo check --lockedandcargo fmt --checkfortests/tmachinetasks/scripts/test-packaging-assets.shmain; editing Ansible,config.nix,images.nix, or cloud-init does not change the tmachine derivation, and editingsrc/doesnix run .#tmachine -- setup ubuntu-docker-rootfulboots and provisions a VM (arm64 macOS)test:e2e) on the first commit, before the crate stayed in placetest:e2e) on the current headChecklist