Skip to content

Commit 1584a9e

Browse files
refactor(tests): move tmachine support files under tests/tmachine
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 <[email protected]>
1 parent 1cb9ef8 commit 1584a9e

68 files changed

Lines changed: 41 additions & 41 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ temp/
190190
e2e/gpu/images/.build/
191191

192192
# Ansible Galaxy roles
193-
/tests/ansible/.roles/
193+
/tests/tmachine/ansible/.roles/
194194

195195
# Secrets/credentials (should never be committed)
196196
*.pem

‎TESTING.md‎

Lines changed: 1 addition & 1 deletion

‎flake.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@
126126
qemuPkgs = testGuestPkgs;
127127
firmwarePkgs = testGuestPkgs;
128128
};
129-
testMachines = import ./tests/config.nix {
129+
testMachines = import ./tests/tmachine/config.nix {
130130
inherit pkgs toolchains;
131131
qemuPkgs = tmachineRuntimePkgs;
132132
firmwarePkgs = tmachineRuntimePkgs;
133133
};
134-
artifacts = pkgs.callPackage ./tests/artifacts.nix { inherit rustToolchain toolchains; };
134+
artifacts = pkgs.callPackage ./tests/tmachine/artifacts.nix { inherit rustToolchain toolchains; };
135135
checkProtobufCompatibility = pkgs.writeShellApplication {
136136
name = "check-protobuf-compatibility";
137137
runtimeInputs = [
@@ -219,7 +219,7 @@
219219
];
220220

221221
shellHook = ''
222-
export ANSIBLE_CONFIG="$(git rev-parse --show-toplevel)/tests/ansible/ansible.cfg"
222+
export ANSIBLE_CONFIG="$(git rev-parse --show-toplevel)/tests/tmachine/ansible/ansible.cfg"
223223
'';
224224
}
225225
);

‎tasks/scripts/test-packaging-assets.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ assert_file_exists() {
4040
service="${ROOT}/deploy/deb/openshell-gateway.service"
4141
control="${ROOT}/deploy/deb/control.in"
4242
spec="${ROOT}/openshell.spec"
43-
package_qualification="${ROOT}/tests/ansible/roles/openshell_packaged_gateway/tasks/main.yaml"
44-
tmachine_gateway_service="${ROOT}/tests/ansible/roles/openshell_gateway/templates/gateway.service.j2"
45-
tmachine_docker_config="${ROOT}/tests/ansible/roles/openshell_gateway/templates/gateway-docker.toml.j2"
46-
tmachine_podman_config="${ROOT}/tests/ansible/roles/openshell_gateway/templates/gateway-podman.toml.j2"
43+
package_qualification="${ROOT}/tests/tmachine/ansible/roles/openshell_packaged_gateway/tasks/main.yaml"
44+
tmachine_gateway_service="${ROOT}/tests/tmachine/ansible/roles/openshell_gateway/templates/gateway.service.j2"
45+
tmachine_docker_config="${ROOT}/tests/tmachine/ansible/roles/openshell_gateway/templates/gateway-docker.toml.j2"
46+
tmachine_podman_config="${ROOT}/tests/tmachine/ansible/roles/openshell_gateway/templates/gateway-podman.toml.j2"
4747
development_gateway="${ROOT}/nix/test-guest/provisioners/roles/gateway-podman/tasks/development-gateway.yml"
4848

4949
assert_file_exists "$service"
File renamed without changes.

tests/ansible/playbooks/conformance/policy-advisor.yaml renamed to tests/tmachine/ansible/playbooks/conformance/policy-advisor.yaml

File renamed without changes.
File renamed without changes.

tests/ansible/playbooks/drivers/podman/default-userns-baseline.yaml renamed to tests/tmachine/ansible/playbooks/drivers/podman/default-userns-baseline.yaml

File renamed without changes.

0 commit comments

Comments
 (0)