Skip to content

Commit 0056959

Browse files
committed
fix(build): reconcile TCP dial callers after merging main
Merge main at 22209de and migrate the new test callers to the nodelay helper's address contract. Signed-off-by: Taylor Mutch <[email protected]>
2 parents a8ff70e + 22209de commit 0056959

373 files changed

Lines changed: 108256 additions & 9489 deletions

File tree

Some content is hidden

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

‎.agents/skills/helm-dev-environment/SKILL.md‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,17 @@ every member one at a time. The PID must survive each case, while an open
195195
replacement confirmed within the recovery timeout, so the runtime terminated
196196
the workload.
197197

198+
For RFC 0017 app-listener validation, enable the listener and supply the app TLS
199+
Secret on the shared Deployment, plus a separate NetworkPolicy allowing the test
200+
client/proxy to reach its app port. Runtime-port access does not grant app access.
201+
Discovery returns the acknowledged owner's Pod IP and app port; no headless app
202+
Service is needed. Exercise HTTP/WebSocket reconnection through graceful downscale
203+
and abrupt loss, preserving workload generation/PID/in-memory state and the public
204+
hostname. Verify stale-owner rejection independently of the replacement's success.
205+
Shared serving leases expire within fifteen seconds of issuance and do not renew
206+
from configuration alone. Do not claim seamless socket migration or infer external
207+
ingress readiness from an advertisement.
208+
198209
### 2. Deploy OpenShell
199210

200211
**Iterative dev** (rebuilds on file changes, recommended during active development):
@@ -255,8 +266,9 @@ task running while using those endpoints.
255266
### Viewing local traces
256267

257268
The gateway exports OTLP/gRPC to
258-
`http://openshell-collector.observability.svc.cluster.local:4317` through the
259-
default Skaffold values. Forward OTLP/gRPC and the trace UI to the host:
269+
`http://openshell-collector.observability.svc.cluster.local:4317` through
270+
`ci/values-local-tracing.yaml`, which only `skaffold.yaml` layers. The Kubernetes
271+
E2E wrapper omits it, so E2E clusters export no traces. Forward OTLP/gRPC and the trace UI to the host:
260272

261273
```bash
262274
mise run helm:k3s:forward
@@ -267,9 +279,10 @@ Kubernetes compute-driver spans under their distinct service names, along with
267279
Agent Sandbox controller reconciliation spans linked through the Sandbox
268280
trace-context annotation. The same command exposes OTLP/gRPC on
269281
`http://127.0.0.1:4317` and, when deployed, the Kubernetes gateway on
270-
`http://127.0.0.1:8090`. The local `gateway:docker`, `gateway:podman`, and
271-
`gateway:vm` tasks detect the collector listener at startup and enable trace
272-
export, OCSF log export, and the agent trace relay only while it is reachable.
282+
`http://127.0.0.1:8090`. The local `gateway`, `gateway:docker`,
283+
`gateway:podman`, and `gateway:vm` tasks enable trace export, OCSF log export,
284+
and the agent trace relay only when `OPENSHELL_DEV_OTLP_ENDPOINT` is set, for
285+
example `OPENSHELL_DEV_OTLP_ENDPOINT=http://127.0.0.1:4317`.
273286
Spans an agent exports from inside a sandbox arrive through the supervisor's
274287
relay with `openshell.telemetry.source=agent` and share `openshell.sandbox.id`
275288
with that sandbox's supervisor spans.
@@ -631,6 +644,7 @@ for dependencies still declared in `Chart.yaml`.
631644
| `deploy/helm/openshell/skaffold.yaml` | Skaffold config — images, Helm releases, values overlays |
632645
| `deploy/helm/openshell/values.yaml` | Default Helm values |
633646
| `deploy/helm/openshell/ci/values-skaffold.yaml` | Dev overrides (image pull policy, TLS disabled for local Skaffold) |
647+
| `deploy/helm/openshell/ci/values-local-tracing.yaml` | OTLP export to the `helm:k3s:create` collector (Skaffold only) |
634648
| `deploy/helm/openshell/ci/values-cert-manager.yaml` | cert-manager PKI overlay (opt-in; disables pkiInitJob) |
635649
| `deploy/helm/openshell/ci/values-gateway.yaml` | Envoy Gateway GRPCRoute + Gateway overlay |
636650
| `deploy/helm/openshell/ci/values-high-availability.yaml` | HA test overlay (`replicaCount: 2` with external PostgreSQL Secret) |

‎.agents/skills/release-captain/SKILL.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ git worktree remove --force "$wt"
169169
```
170170

171171
4. **Watch and verify.** Check that `Select Qualified Prerelease` names the
172-
approved candidate, the GitHub Release has assets, no job failed, and the
173-
wheel reached PyPI:
172+
approved candidate, the GitHub Release has assets and no job failed:
174173

175174
```shell
176175
gh run watch <run-id> --exit-status

‎.agents/skills/release-openshell/SKILL.md‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Release creates `vX.Y.Z` at that exact commit, then rebuilds and publishes all
3333
stable artifacts without rerunning qualification. Embedded versions change, so
3434
stable artifacts are not byte-identical to the qualified prerelease. An existing
3535
stable tag may be retried only if it already points to the selected commit. A retry
36-
publishes only missing artifacts; published images, charts, release assets, npm,
37-
and PyPI versions are kept, while the snap is uploaded again.
36+
publishes only missing artifacts; published images, charts, release assets, and
37+
npm versions are kept, while the snap is uploaded again.
3838
Stable images are saved as OCI archives during the build and pushed under the
3939
stable version tags during publication. Their SBOMs are verified before updating
4040
`latest`; the qualified prerelease's commit-SHA image tags remain unchanged.
@@ -84,17 +84,6 @@ immutable version and advance latest only for a newer version.
8484

8585
Watch the stable release run and report its result.
8686

87-
## PyPI publishing
87+
## Python SDK
8888

89-
Stable releases publish the Python wheel to PyPI from `wheel-publish.yml`, which the `publish-pypi` job in `release-publish.yml` calls after the GitHub Release is created. The workflow downloads the wheel from the stable GitHub Release, not a run's build artifact, and checks the stable tag's source commit and the wheel's release checksum. It uses Trusted Publishing with the `pypi` GitHub environment. PyPI matches the workflow file that contains the publishing job, so configure the `openshell` PyPI project's GitHub publisher with owner `NVIDIA`, repository `OpenShell`, workflow `wheel-publish.yml`, and environment `pypi`. No PyPI API token or GitLab trigger credentials are required.
90-
91-
The environment must allow the branch used to dispatch Release or `wheel-publish.yml`. For a support release, explicitly allow its support branch before dispatching. Required reviewers, if configured, must approve the PyPI job. An existing wheel on PyPI is skipped; PyPI does not allow replacing a published wheel.
92-
93-
If a stable release did not reach PyPI, publish the wheel without rerunning Release:
94-
95-
```shell
96-
gh workflow run wheel-publish.yml -R NVIDIA/OpenShell --ref main \
97-
-f release-tag=vX.Y.Z -f source-sha=<tag commit> -f python-version=X.Y.Z
98-
```
99-
100-
Development and prerelease wheels remain GitHub Release assets and do not publish to PyPI.
89+
Core no longer builds or publishes the Python SDK for releases. The stable, prerelease, and rolling `dev` GitHub Releases carry no wheel, and nothing in core publishes to PyPI. `openshell` `0.1.7` is the last core-built wheel. From `0.1.8` on, [ai-openshell/sdk-python](https://github.com/ai-openshell/sdk-python) publishes `openshell` on the same day as each stable core release, once its update PR for the core tag merges.

‎.github/actions/setup-e2e-cli/action.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Setup E2E CLI
22
description: Download architecture-matched prebuilt OpenShell host CLIs for E2E tests
33

4+
inputs:
5+
conformance:
6+
description: Also download the prebuilt openshell-conformance program and set OPENSHELL_CONFORMANCE_BIN
7+
required: false
8+
default: "false"
9+
410
runs:
511
using: composite
612
steps:
@@ -17,3 +23,19 @@ runs:
1723
chmod +x "$cli"
1824
"$cli" --version
1925
echo "OPENSHELL_BIN=$cli" >> "$GITHUB_ENV"
26+
27+
- name: Download prebuilt openshell-conformance
28+
if: inputs.conformance == 'true'
29+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
30+
with:
31+
name: ${{ runner.arch == 'X64' && 'openshell-conformance-x86_64-unknown-linux-musl' || 'openshell-conformance-aarch64-unknown-linux-musl' }}
32+
path: .e2e/prebuilt-conformance
33+
34+
- name: Configure prebuilt openshell-conformance
35+
if: inputs.conformance == 'true'
36+
shell: bash
37+
run: | # zizmor: ignore[github-env] persists only a fixed path under the trusted workspace
38+
program="$GITHUB_WORKSPACE/.e2e/prebuilt-conformance/openshell-conformance"
39+
chmod +x "$program"
40+
"$program" list
41+
echo "OPENSHELL_CONFORMANCE_BIN=$program" >> "$GITHUB_ENV"

‎.github/workflows/branch-checks.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ jobs:
392392
cargo nextest run --locked --config-file .config/nextest.toml --profile ci --manifest-path tests/tmachine/Cargo.toml
393393
cargo nextest run --locked --config-file .config/nextest.toml --profile ci --manifest-path tests/runner/Cargo.toml
394394
cargo nextest run --locked --config-file .config/nextest.toml --profile ci --manifest-path tests/support/Cargo.toml
395+
tasks/scripts/check-conformance-program.sh
395396
396397
rust-postgres-test:
397398
name: Rust PostgreSQL tests
@@ -597,6 +598,9 @@ jobs:
597598
- name: Test
598599
run: mise run test:python
599600

601+
- name: Test Python scripts
602+
run: mise run test:python-scripts
603+
600604
- name: Test local gateway configuration helpers
601605
run: |
602606
bash tasks/scripts/test-gateway-pull-policy.sh
@@ -637,6 +641,41 @@ jobs:
637641
echo "$changed"
638642
exit 1
639643
644+
python-sdk-freeze:
645+
# The Python SDK moved to ai-openshell/sdk-python (#5287), which imported it
646+
# at v0.1.7. Its files stay only until core removes them, so PRs must not
647+
# add or change them. Deleting files is allowed (the removal PR). The paths
648+
# are the ones the import moved: all of python/ plus the two SDK build
649+
# scripts. The shared root pyproject.toml and uv.lock stay editable.
650+
# Merge queue runs skip this job; the PR already passed it on its mirror.
651+
name: Python SDK Freeze
652+
needs: pr_metadata
653+
if: needs.pr_metadata.outputs.should_run == 'true' && github.event_name == 'push'
654+
runs-on: ubuntu-latest
655+
timeout-minutes: 5
656+
steps:
657+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
658+
with:
659+
fetch-depth: 0
660+
persist-credentials: false
661+
662+
- name: Reject changes to the Python SDK
663+
env:
664+
BASE_SHA: ${{ needs.pr_metadata.outputs.base_sha }}
665+
run: |
666+
set -euo pipefail
667+
changed=$(git diff --name-only --diff-filter=d "${BASE_SHA}...HEAD" -- \
668+
python \
669+
tasks/scripts/generate_python_proto.py)
670+
if [ -z "$changed" ]; then
671+
echo "No added or changed Python SDK files."
672+
exit 0
673+
fi
674+
echo "::error title=Python SDK moved::The Python SDK moved to https://github.com/ai-openshell/sdk-python. Drop the Python SDK changes from this PR and open SDK changes there. Regenerated bindings are not needed here; sdk-python regenerates them from core releases."
675+
echo "Changed Python SDK files:"
676+
echo "$changed"
677+
exit 1
678+
640679
markdown:
641680
name: Markdown
642681
needs: pr_metadata
@@ -686,3 +725,19 @@ jobs:
686725
run: |
687726
OPENSHELL_NPM_VERSION="$(uv run python tasks/scripts/release.py get-version --npm)" \
688727
mise run sdk:ts:publish
728+
729+
install-script:
730+
name: install.sh
731+
needs: pr_metadata
732+
if: needs.pr_metadata.outputs.should_run == 'true'
733+
runs-on: ubuntu-latest
734+
timeout-minutes: 10
735+
steps:
736+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
737+
738+
# The RPM lookup test uses gawk when present; gawk warns on bad escapes.
739+
- name: Install gawk
740+
run: sudo apt-get install -y --no-install-recommends gawk
741+
742+
- name: Test install.sh
743+
run: tasks/scripts/test-install-sh.sh

0 commit comments

Comments
 (0)