Skip to content

Commit e06a0eb

Browse files
fix(tests): use the tmachine paths for the first testkit lane
The tmachine move landed on main, so the sandbox-lifecycle playbook belongs under tests/tmachine/ansible. Move it there, point the test bundle input and the JUnit fetch at the new locations, and key the disk cache on the new playbook path. Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>
1 parent 5471bc2 commit e06a0eb

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎.github/workflows/integration-runner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
# actions/cache doesn't save after an exact key hit, so a fixed key
7878
# would rebuild the changed layers on every run. Key on the playbooks
7979
# and fall back to the newest entry for the same runner.
80-
key: tmachine-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('tests/ansible/**') }}
80+
key: tmachine-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('tests/tmachine/ansible/**') }}
8181
restore-keys: |
8282
tmachine-${{ runner.os }}-${{ runner.arch }}-
8383

‎TESTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ CI runs them in the `testkit-integration` job of Branch E2E (label `test:e2e`),
155155
through a tmachine lane that installs the Debian package. The suite's playbook
156156
fails the lane if fewer tests run than it expects, so raise
157157
`suite_expected_tests` in
158-
`tests/ansible/playbooks/suites/sandbox-lifecycle.yaml` when you add a
158+
`tests/tmachine/ansible/playbooks/suites/sandbox-lifecycle.yaml` when you add a
159159
test.
160160

161161
Workspaces that build root crates through path dependencies must lock shared

tests/ansible/playbooks/suites/sandbox-lifecycle.yaml renamed to tests/tmachine/ansible/playbooks/suites/sandbox-lifecycle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
- name: Fetch the JUnit report
129129
ansible.builtin.fetch:
130130
src: "{{ item.path }}"
131-
dest: "{{ playbook_dir }}/../../../../artifacts/tmachine-diagnostics/junit/sandbox-lifecycle-{{ inventory_hostname }}.xml"
131+
dest: "{{ playbook_dir }}/../../../../../artifacts/tmachine-diagnostics/junit/sandbox-lifecycle-{{ inventory_hostname }}.xml"
132132
flat: true
133133
loop: "{{ suite_junit.files | default([]) }}"
134134
failed_when: false

‎tests/tmachine/config.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ let
166166
name = "sandbox-lifecycle";
167167
playbooks = [ "ansible/playbooks/suites/sandbox-lifecycle.yaml" ];
168168
inputs = {
169-
sandbox_lifecycle_test_bundle = "../artifacts/test-archives/${muslTarget}/sandbox-lifecycle-tests.tar";
169+
sandbox_lifecycle_test_bundle = "../../artifacts/test-archives/${muslTarget}/sandbox-lifecycle-tests.tar";
170170
};
171171
}
172172
{

0 commit comments

Comments
 (0)