Skip to content

Commit 1767ec0

Browse files
test(tmachine): centralize gateway diagnostics and trim K3s changes
Move failure diagnostics into one openshell_diagnostics role that collects the systemd gateway journal and, when K3s is installed, the K3s diagnostics. Drop install-time diagnostics so the K3s installer change stays minimal, revert unrelated skill edits, and shorten the CI.md note. Signed-off-by: Matthew Grossman <[email protected]>
1 parent b14566a commit 1767ec0

7 files changed

Lines changed: 173 additions & 198 deletions

File tree

‎.agents/skills/watch-github-actions/SKILL.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,7 @@ gh run rerun <run-id>
245245
```bash
246246
gh run view <run-id> --log-failed
247247
```
248-
4. For tmachine K3s failures, download `tmachine-diagnostics-*` artifacts and
249-
preserve the first failure logs before rerunning. Inspect Service routing,
250-
EndpointSlices and CLI status alongside the API, node and gateway logs.
251-
Readiness polling within a job is different from rerunning a failed suite.
252-
5. Rerun the failed jobs if needed:
248+
4. Rerun the failed jobs if needed:
253249
```bash
254250
gh run rerun <run-id> --failed
255251
```

‎CI.md‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,11 @@ compatibility baseline for the v1beta1 Sandbox API. It does not track the local
105105
K3s development default, currently v1.0.3. OpenShell also supports v0.4.6 through
106106
its v1alpha1 fallback, so v0.5.0 is not the overall minimum supported version.
107107

108-
The conformance CLI runs on the K3s node inside the tmachine guest and connects
109-
directly to the gateway's default ClusterIP Service on its gRPC port. Installation
110-
discovers the Service address and registers it once; the installed disk preserves that
111-
registration across test boots. Recreating the Service requires reprovisioning
112-
the fixture rather than repairing registrations at boot. K3s installation and
113-
conformance failures preserve bounded diagnostics under
114-
`artifacts/tmachine-diagnostics`, also uploaded by `Integration Tests`.
115-
116-
On every installer, the conformance playbook waits up to five minutes for
117-
`openshell status` to report a connected gateway before running tests, because
118-
each test boot restarts the gateway. Interactive shell boots skip this wait so
119-
failed gateways remain debuggable.
108+
The `ubuntu-k3s` lane registers the gateway's ClusterIP Service directly, so
109+
recreating the Service requires reprovisioning the fixture. Before conformance,
110+
every installer waits up to five minutes for a connected gateway; interactive
111+
shells skip the wait. K3s failures upload diagnostics as `tmachine-diagnostics-*`
112+
artifacts.
120113

121114
### Run only the policy advisor conformance tests
122115

‎skills/debug-openshell-cluster/SKILL.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -723,13 +723,7 @@ kubectl -n openshell get svc openshell -o wide
723723
kubectl -n openshell get endpoints openshell
724724
```
725725

726-
Clients running on a Kubernetes node can use the Service's ClusterIP and gRPC
727-
port directly when node routing supports it. The IP stays stable across Pod
728-
replacement and node reboots while the Service exists. It is not an external
729-
endpoint; clients outside that network need another exposure method. Recreating
730-
the Service can change its IP, so check the registered endpoint afterward.
731-
732-
For local port-forward testing from outside the cluster network:
726+
For local port-forward testing:
733727

734728
```bash
735729
kubectl -n openshell port-forward service/openshell 8080:8080

‎tests/ansible/playbooks/conformance/cli.yaml‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
- name: Run OpenShell conformance tests
66
hosts: all
77
gather_facts: false
8+
vars:
9+
# Conformance is skipped when the gateway never connects.
10+
conformance_failed: "{{ gateway_status is failed or conformance_result.rc != 0 }}"
811
tasks:
912
- name: Wait for SSH
1013
ansible.builtin.wait_for_connection:
@@ -98,33 +101,12 @@
98101
- name: Show OpenShell conformance diagnostics
99102
ansible.builtin.debug:
100103
var: conformance_result
101-
when: conformance_result.rc | default(0) != 0
104+
when: conformance_failed
102105

103-
- name: Read OpenShell gateway logs
104-
become: true
105-
ansible.builtin.command:
106-
argv:
107-
- journalctl
108-
- --no-pager
109-
- --lines
110-
- "500"
111-
- _SYSTEMD_UNIT=openshell-gateway.service
112-
- "+"
113-
- _SYSTEMD_USER_UNIT=openshell-gateway.service
114-
register: openshell_gateway_logs
115-
changed_when: false
116-
failed_when: false
117-
when: conformance_result.rc | default(1) != 0
118-
119-
- name: Show OpenShell gateway logs
120-
ansible.builtin.debug:
121-
var: openshell_gateway_logs.stdout_lines
122-
when: conformance_result.rc | default(1) != 0
123-
124-
- name: Collect K3s conformance diagnostics
106+
- name: Collect OpenShell gateway diagnostics
125107
ansible.builtin.include_role:
126-
name: openshell_k3s_diagnostics
127-
when: conformance_result.rc | default(1) != 0
108+
name: openshell_diagnostics
109+
when: conformance_failed
128110

129111
- name: Require a connected gateway
130112
ansible.builtin.assert:

0 commit comments

Comments
 (0)