Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
055f2bc
fix(e2e): build changed sandbox images locally
sandl99 Aug 25, 2026
723a32b
fix(e2e): complete local image qualification
sandl99 Aug 25, 2026
6a55a5f
refactor(e2e): share image input matching
sandl99 Aug 25, 2026
72e7af8
fix(e2e): route Pi to its candidate image
sandl99 Aug 25, 2026
f151510
fix(onboard): report pairing settlement failures
sandl99 Aug 25, 2026
c1e3570
fix(e2e): preserve local DCode base resolution
sandl99 Aug 25, 2026
f340c61
fix(onboard): consume pairing producer receipts
sandl99 Aug 25, 2026
c0d08cd
test(e2e): use valid vLLM storage GPU UUID
sandl99 Aug 25, 2026
5acda20
Merge remote-tracking branch 'origin/main' into fix/e2e-local-build-f…
sandl99 Aug 25, 2026
51d0933
fix(e2e): use private managed-image catalog writer
sandl99 Aug 25, 2026
b8c4387
test(e2e): remove duplicate managed-image cases
sandl99 Aug 25, 2026
a1b9a0a
test(e2e): cover renamed managed-image inputs
sandl99 Aug 25, 2026
88ab371
refactor(e2e): remove unrelated pairing changes
sandl99 Aug 25, 2026
4d2df93
test(e2e): cover PR revision guards
sandl99 Aug 25, 2026
d73cd20
fix(e2e): qualify local images on arm64
sandl99 Aug 25, 2026
80f0aba
test(e2e): set multiarch workload source
sandl99 Aug 25, 2026
95cd106
Merge branch 'main' into fix/e2e-local-build-for-image-changes
sandl99 Aug 26, 2026
6b980cc
fix(onboard): restore local build fallback
sandl99 Aug 26, 2026
65ed831
fix(e2e): harden managed image selection
sandl99 Aug 26, 2026
39d60e4
fix(e2e): qualify local images on protected runtime
sandl99 Aug 26, 2026
b188ad6
fix(mcp): wait for final provider revision
sandl99 Aug 26, 2026
12fe0e8
fix(e2e): resolve local Dockerfile from agent
sandl99 Aug 26, 2026
087f361
fix(onboard): wait for canonical pairing before warmup
sandl99 Aug 26, 2026
b49077a
docs(e2e): qualify GitHub rate-limit retries
sandl99 Aug 26, 2026
82206e4
chore(mcp): leave provider revision fix to owning PR
sandl99 Aug 26, 2026
66fd3ed
chore(onboard): leave pairing settlement unchanged
sandl99 Aug 26, 2026
2513729
merge(main): synchronize current base
sandl99 Aug 26, 2026
b6f45b2
fix(e2e): preserve local base identity on GPU
sandl99 Aug 26, 2026
272b372
fix(e2e): keep workload selection acyclic
sandl99 Aug 26, 2026
f560f03
fix(ci): resolve managed image verification failures
sandl99 Aug 26, 2026
b425a07
Merge remote-tracking branch 'origin/main' into fix/e2e-local-build-f…
sandl99 Aug 26, 2026
6b57594
test(ci): remove duplicate advisor watch trigger
sandl99 Aug 26, 2026
993c194
chore(mcp): remove unrelated credential revision fix
sandl99 Aug 26, 2026
9259f23
chore(ci): leave advisor trigger fix to owner
sandl99 Aug 26, 2026
44026cd
Merge branch 'main' into fix/e2e-local-build-for-image-changes
sandl99 Aug 26, 2026
649968b
fix(e2e): bind workload selection to commit trees
sandl99 Aug 26, 2026
1effafb
merge(main): synchronize current base
sandl99 Aug 26, 2026
7dee76e
merge: resolve conflicts with main
github-actions[bot] Aug 26, 2026
8803497
merge: resolve conflicts with main
github-actions[bot] Aug 26, 2026
577fe69
Merge branch 'main' into fix/e2e-local-build-for-image-changes
prekshivyas Aug 26, 2026
4f2407a
merge(main): resolve PR #10263 conflicts
sandl99 Aug 28, 2026
4661092
Merge remote-tracking branch 'origin/main' into fix/e2e-local-build-f…
sandl99 Aug 28, 2026
e1b8531
refactor(e2e): remove unused PR image catalog path
sandl99 Aug 28, 2026
a2b575e
fix(e2e): retain managed image catalog assembler
sandl99 Aug 28, 2026
0847dd9
refactor(e2e): remove obsolete DCode publication path
sandl99 Aug 28, 2026
20a39f1
fix(e2e): retain trusted base for local builds
sandl99 Aug 28, 2026
fecee10
refactor(e2e): remove unused publication outputs
sandl99 Aug 28, 2026
cdf63ce
Merge branch 'main' into fix/e2e-local-build-for-image-changes
sandl99 Aug 28, 2026
86bcb5b
Merge branch 'main' into fix/e2e-local-build-for-image-changes
sandl99 Aug 28, 2026
5994ff0
fix(e2e): bind image selection to commit trees
sandl99 Aug 29, 2026
f39859c
merge(main): synchronize current base
sandl99 Aug 29, 2026
6f7f097
test(e2e): map live helpers to existing coverage
sandl99 Aug 29, 2026
d9331e3
test(onboard): remove duplicate activation case
sandl99 Aug 29, 2026
363bbea
merge: resolve conflicts with main
github-actions[bot] Aug 30, 2026
f977478
merge: resolve conflicts with main
github-actions[bot] Aug 31, 2026
b247dee
Merge branch 'main' into fix/e2e-local-build-for-image-changes
cv Aug 31, 2026
53fc625
fix(e2e): restore workload source contract
cv Aug 31, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 6 additions & 40 deletions .github/workflows/e2e-standard-profile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ on:
cli_artifact_provenance:
required: true
type: string
managed_image_catalog:
managed_image_revision:
required: true
type: string
workload_source:
required: true
type: string
credential_boundary:
Expand Down Expand Up @@ -106,7 +109,9 @@ jobs:
timeout-minutes: ${{ inputs.timeout_minutes }}
env:
E2E_JOB: "1"
E2E_MANAGED_IMAGE_REVISION: ${{ inputs.managed_image_revision }}
E2E_TARGET_ID: ${{ inputs.target_id }}
E2E_WORKLOAD_SOURCE: ${{ inputs.workload_source }}
NEMOCLAW_RUN_LIVE_E2E: "1"
NEMOCLAW_E2E_EXPECTED_SHA: ${{ inputs.candidate_sha }}
NEMOCLAW_E2E_CORRELATION_ID: ${{ inputs.risk_signal_correlation_id }}
Expand Down Expand Up @@ -392,45 +397,6 @@ jobs:
with:
provenance-json: ${{ inputs.cli_artifact_provenance }}

- name: Materialize temporary managed-image catalog
if: ${{ inputs.managed_image_catalog != '' }}
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
env:
CANDIDATE_SHA: ${{ inputs.candidate_sha }}
MANAGED_IMAGE_CATALOG: ${{ inputs.managed_image_catalog }}
RESTORE_CLI: ${{ inputs.restore_cli && 'true' || 'false' }}
run: |
set -euo pipefail
catalog_path="${RUNNER_TEMP}/e2e-managed-image-catalog.json"
jq -e --arg revision "$CANDIDATE_SHA" '
type == "object" and length > 0 and
all(.[];
.source.revision == $revision and
(.source.release | type == "string" and length > 0) and
(.source.cohort | type == "string" and length > 0)
) and
([.[].source.release] | unique | length) == 1 and
([.[].source.cohort] | unique | length) == 1
' <<<"$MANAGED_IMAGE_CATALOG" >/dev/null || {
echo "::error::managed-image catalog source identity does not match the candidate" >&2
exit 1
}
if [[ "$RESTORE_CLI" == "true" ]]; then
candidate_release="v$(jq -r '.nemoclawVersion' dist/build-identity.json)"
jq -e --arg release "$candidate_release" '
all(.[]; .source.release == $release)
' <<<"$MANAGED_IMAGE_CATALOG" >/dev/null || {
echo "::error::managed-image catalog release does not match the restored CLI" >&2
exit 1
}
fi
jq -c . <<<"$MANAGED_IMAGE_CATALOG" >"$catalog_path"
[[ -s "$catalog_path" && ! -L "$catalog_path" ]] || {
echo "::error::temporary managed-image catalog is invalid" >&2
exit 1
}
printf 'NEMOCLAW_E2E_MANAGED_IMAGE_CATALOG=%s\n' "$catalog_path" >>"$GITHUB_ENV"

- name: Install reviewed cloudflared
if: ${{ inputs.cloudflared }}
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
Expand Down
155 changes: 66 additions & 89 deletions .github/workflows/e2e.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/workflows/managed-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ jobs:
find "$RUNNER_TEMP/managed-pr-contracts" -type f -name contract.json -print0
)
node --experimental-strip-types --no-warnings \
tools/e2e/pr-managed-image-publication.mts assemble \
tools/e2e/pr-managed-image-source.mts assemble \
"$CANDIDATE_SHA" \
"$NEMOCLAW_MANAGED_ACTIVATION_CATALOG" \
"${contracts[@]}"
Expand Down Expand Up @@ -1146,7 +1146,7 @@ jobs:
find "$RUNNER_TEMP/managed-pr-contracts" -type f -name contract.json -print0
)
node --experimental-strip-types --no-warnings \
tools/e2e/pr-managed-image-publication.mts assemble \
tools/e2e/pr-managed-image-source.mts assemble \
"$CANDIDATE_SHA" \
"$NEMOCLAW_E2E_MANAGED_IMAGE_CATALOG" \
"${contracts[@]}"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/RETRY_INVENTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Exhaustion remains failed.
| `hermes-pinned-source-archive` | Hermes base-image source archive; `scripts/checks/download-hermes-source-archive.sh`, `agents/hermes/Dockerfile.base` | Final HTTP 429 only; curl transport failures and every other HTTP status are terminal | 3 total attempts; fixed 1s then 2s | Each attempt repeats the same read-only GET for one version-pinned archive. A failed or partial file is removed before another attempt, and the existing SHA-256 check remains before extraction. | GitHub source archive | `passed-first-attempt`, `passed-after-retry`, `failed-no-retry`, or `exhausted` | The build log records only the attempt number, total attempts, outcome, retry delay, and bounded failure class. Curl output, response content, URLs, paths, headers, and environment values are excluded. | Eligible bounded external read after HTTP 429 in both native Hermes base-image builds in #9815; checksum, archive, extraction, and patch failures remain terminal, and no workflow or platform-build retry occurs |
| `trusted-controller-collaborator-permission-read` | Collaborator-permission reads for manual PR dispatch and Launchable E2E dispatch; `.github/workflows/e2e.yaml` | Curl exit 5, 6, 7, 16, 18, 28, 35, 52, 55, 56, 92, 95, or 96; HTTP 408, 429, or 5xx | 3 attempts; linear 1s then 2s | Read-only GitHub API request | GitHub API | Transient API read versus terminal authentication, authorization, actor, or response failure | Operation name, attempt number, and sanitized failure class or HTTP status; no response body, header, or token | Eligible bounded read; HTTP 401, 403, 404, and 422, malformed responses, actor failures, and insufficient roles remain terminal; no cached permission or workflow rerun |
| `pr-exact-openclaw-mcp-repetition` | Exact managed-image OpenClaw MCP discovery and lifecycle acceptance; `.github/workflows/managed-images.yaml`, `test/e2e/live/mcp-bridge.test.ts` | Either independent matrix execution fails | 2 required executions on fresh runners; 0 workflow or test retries | Each execution creates and cleans up its own sandbox against the same exact candidate publication cohort | NemoClaw | Each execution passes or fails independently; both must pass | Existing redacted MCP diagnostics, request ledger, cleanup evidence, and fixture-credential scan for each matrix pass | Fixed acceptance repetition required by #8746; not a retry, and one pass never masks the other; trusted-private DNS-rebinding remains in full E2E where the supervisor resolver is authoritative |
| `github-exact-artifact-content-read` | Bound base-image or PR managed-image contract artifact; `tools/e2e/exact-artifact-download.mts`, `tools/e2e/pr-managed-image-publication.mts` | Transport failure, HTTP 408, HTTP 429, or HTTP 5xx while reading one pre-bound artifact ID | 3 attempts; Retry-After or linear delay capped at 10s | Read-only request against one immutable artifact ID, name, size, digest, producer run, attempt, and producer commit | GitHub artifact service | `passed-first-attempt`, `passed-after-retry`, `exhausted` for transient exhaustion, or `failed-no-retry` for terminal HTTP; identity, size, digest, archive, and contract failures throw without an aggregate outcome or `failureClass` | Content-read attempts log only the sanitized operation, attempt, HTTP status or transport class, and outcome; thrown validation failures expose only their bounded error message, never headers, body, token, signed URL, or artifact content | Standalone bounded content read; it does not use `retry-policy.ts` or `RetryEvidence`, and all identity, integrity, archive, and contract failures remain terminal |
| `github-exact-artifact-content-read` | Bound base-image or managed-image contract artifact; `tools/e2e/exact-artifact-download.mts` | Transport failure, HTTP 408, HTTP 429, or HTTP 5xx while reading one pre-bound artifact ID | 3 attempts; Retry-After or linear delay capped at 10s | Read-only request against one immutable artifact ID, name, size, digest, producer run, attempt, and producer commit | GitHub artifact service | `passed-first-attempt`, `passed-after-retry`, `exhausted` for transient exhaustion, or `failed-no-retry` for terminal HTTP; identity, size, digest, archive, and contract failures throw without an aggregate outcome or `failureClass` | Content-read attempts log only the sanitized operation, attempt, HTTP status or transport class, and outcome; thrown validation failures expose only their bounded error message, never headers, body, token, signed URL, or artifact content | Standalone bounded content read; it does not use `retry-policy.ts` or `RetryEvidence`, and all identity, integrity, archive, and contract failures remain terminal |
| `inference-set-route-convergence` | Sandbox inference probe after one OpenShell route selection; `src/lib/actions/inference-set-provider.ts`, `src/lib/actions/inference-set.ts` | HTTP 400 or 404 only when the selected API family changes; authentication, authorization, unsafe or malformed input, every other HTTP status, transport failure, and probe failure are terminal | Initial 6s route-cache wait after a provider/model change; then up to 3 probes with 2s and 4s retry delays | Each retry repeats only the read-only sandbox inference probe after one route mutation | OpenShell route cache | Converged, terminal failure, or exhausted rollback | Retry progress records only HTTP status, attempt number, and delay; the final command error stays redacted, and focused tests assert the exact attempt count and rollback | The initial wait covers one full 5s OpenShell 0.0.106 cache-refresh interval even when the stale route returns a valid 2xx; exhaustion restores the prior route, removes the uncommitted provider, and remains failed |
| `inference-switch-ts` | Verified inference route update; `test/e2e/fixtures/inference-switch-retry.ts` | Timeout, reset, DNS/connectivity/connect error, request transport error, or exact 502/503/504 status; authentication, authorization, policy, malformed-input, and invalid-request signals take precedence | 1-10 attempts; linear 5s | Setting the same desired provider/model is idempotent | Inference provider | Shared `RetryEvidence` classifications | Every attempt classification and aggregate outcome; command artifacts remain separate and redacted | Uses `runBoundedRetry`; deterministic verification mismatches stop; no `--no-verify` exhaustion bypass |
| `inference-switch-shell` | Verified shell inference route update; `test/e2e/lib/inference-switch-retry.sh` | Same bounded transient and terminal-precedence signatures as the TypeScript helper | 1-10 attempts; linear 5s | Setting the same desired provider/model is idempotent | Inference provider | Exit status remains failed on exhaustion | Existing command output and retry progress | Bounded compatibility helper; no `--no-verify` exhaustion bypass |
Expand Down
23 changes: 11 additions & 12 deletions test/e2e/fixtures/workload-source-env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,35 @@ import path from "node:path";

import { REPO_ROOT } from "./paths.ts";

const LEGACY_DOCKERFILE_BY_AGENT = {
const LOCAL_DOCKERFILE_BY_AGENT = {
openclaw: "Dockerfile",
hermes: "agents/hermes/Dockerfile",
"langchain-deepagents-code": "agents/langchain-deepagents-code/Dockerfile",
} as const;

type LegacyDockerfileAgent = keyof typeof LEGACY_DOCKERFILE_BY_AGENT;
type LocalDockerfileAgent = keyof typeof LOCAL_DOCKERFILE_BY_AGENT;

function legacyDockerfileAgent(env: NodeJS.ProcessEnv): LegacyDockerfileAgent {
function localDockerfileAgent(env: NodeJS.ProcessEnv): LocalDockerfileAgent {
const agent = env.NEMOCLAW_AGENT ?? "openclaw";
if (agent in LEGACY_DOCKERFILE_BY_AGENT) return agent as LegacyDockerfileAgent;
if (agent in LOCAL_DOCKERFILE_BY_AGENT) return agent as LocalDockerfileAgent;
return "openclaw";
}

/**
* Existing live E2E targets retain the product's default legacy-Dockerfile
* path. Targets that must select a source explicitly do so through the
* provider-neutral E2E_WORKLOAD_SOURCE contract.
* Live E2E targets select the trusted managed image or a Dockerfile from the
* candidate checkout through the E2E_WORKLOAD_SOURCE contract.
*
* This is applied at the final fixture spawn boundary so an agent selected by
* a test command receives its own Dockerfile rather than an OpenClaw default.
*/
export function resolveLiveE2eWorkloadSourceEnv(input: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
const targetId = input.E2E_TARGET_ID;
const source = input.E2E_WORKLOAD_SOURCE;
if (!targetId || source !== "legacy-dockerfile") return input;
const targetId = input.E2E_TARGET_ID ?? process.env.E2E_TARGET_ID;
const source = input.E2E_WORKLOAD_SOURCE ?? process.env.E2E_WORKLOAD_SOURCE;
if (!targetId || source !== "local-dockerfile") return input;
if (input.NEMOCLAW_FROM_DOCKERFILE) return input;
const agent = legacyDockerfileAgent(input);
const agent = localDockerfileAgent({ ...process.env, ...input });
return {
...input,
NEMOCLAW_FROM_DOCKERFILE: path.join(REPO_ROOT, LEGACY_DOCKERFILE_BY_AGENT[agent]),
NEMOCLAW_FROM_DOCKERFILE: path.join(REPO_ROOT, LOCAL_DOCKERFILE_BY_AGENT[agent]),
};
}
52 changes: 43 additions & 9 deletions test/e2e/support/base-image-publication-workflow-boundary.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@ describe("base-image publication workflow boundary (#7372)", () => {
],
])(
"classifies %s without executing untrusted code (#7372)",
(_case, eventName, checkoutSha, ref, required, reuse) => {
(_case, eventName, checkoutSha, ref, required, pr) => {
expect(
runClassifier({
checkoutSha,
eventName,
ref,
repository: "NVIDIA/NemoClaw",
}),
).toEqual({ output: `required=${required}\nreuse=${reuse}\n`, status: 0 });
).toEqual({ output: `required=${required}\npr=${pr}\n`, status: 0 });
},
);

Expand Down Expand Up @@ -193,20 +193,49 @@ describe("base-image publication workflow boundary (#7372)", () => {
["Node condition", (value) => (gateSteps(value)[2].if = "${{ always() }}")],
["Node pin", (value) => (gateSteps(value)[2].uses = "actions/setup-node@v6")],
["Node version", (value) => (gateSteps(value)[2].with!["node-version"] = 20)],
["verifier condition", (value) => (gateSteps(value)[3].if = "${{ always() }}")],
["verifier token", (value) => (gateSteps(value)[3].env!.GITHUB_TOKEN = "${{ secrets.TOKEN }}")],
[
"selector condition",
(value) => (gateStep(value, "Select PR workload source").if = "${{ always() }}"),
],
[
"selector token",
(value) =>
(gateStep(value, "Select PR workload source").env!.GITHUB_TOKEN = "${{ secrets.TOKEN }}"),
],
[
"PR base checkout ref",
(value) =>
(gateStep(value, "Check out trusted PR base").with!.ref = "${{ inputs.checkout_sha }}"),
],
[
"verifier condition",
(value) =>
(gateStep(value, "Verify applicable base-image publication").if = "${{ always() }}"),
],
[
"verifier token",
(value) =>
(gateStep(value, "Verify applicable base-image publication").env!.GITHUB_TOKEN =
"${{ secrets.TOKEN }}"),
],
[
"verifier SHA",
(value) => (gateSteps(value)[3].env!.EXPECTED_SHA = "${{ inputs.checkout_sha }}"),
(value) =>
(gateStep(value, "Verify applicable base-image publication").env!.EXPECTED_SHA =
"${{ inputs.checkout_sha }}"),
],
[
"managed-image publication requirement",
(value) => (gateSteps(value)[3].env!.REQUIRE_MANAGED_IMAGE_PUBLICATION = "0"),
(value) =>
(gateStep(value, "Verify applicable base-image publication").env![
"REQUIRE_MANAGED_IMAGE_PUBLICATION"
] = "0"),
],
[
"verifier command",
(value) => {
gateSteps(value)[3].run = "node tools/e2e/base-image-publication.mts";
gateStep(value, "Verify applicable base-image publication").run =
"node tools/e2e/base-image-publication.mts";
},
],
[
Expand All @@ -229,15 +258,20 @@ describe("base-image publication workflow boundary (#7372)", () => {
"node tools/e2e/dcode-base-image-contract.mts contract.json"),
],
["step count", (value) => gateSteps(value).push({ name: "Unreviewed step", run: "true" })],
["matrix publication dependency", (value) => (value.jobs["generate-matrix"].needs = [])],
[
"matrix publication dependency",
(value) => (value.jobs["generate-matrix"].needs = "base-image-publication"),
"matrix workload source",
(value) => (value.jobs["generate-matrix"].outputs!.workload_source = "${{ github.sha }}"),
],
["live publication dependency", (value) => (value.jobs.live.needs = ["generate-matrix"])],
[
"live managed-image revision",
(value) => (value.jobs.live.env!.E2E_MANAGED_IMAGE_REVISION = "${{ github.sha }}"),
],
[
"live workload source",
(value) => (value.jobs.live.env!.E2E_WORKLOAD_SOURCE = "managed-image"),
],
[
"cloud-onboard publication dependency",
(value) => (value.jobs["cloud-onboard"].needs = ["generate-matrix"]),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe("Bedrock raw-command progress", () => {
artifacts,
env: {
E2E_TARGET_ID: "inference-routing",
E2E_WORKLOAD_SOURCE: "legacy-dockerfile",
E2E_WORKLOAD_SOURCE: "local-dockerfile",
NEMOCLAW_AGENT: "langchain-deepagents-code",
},
progress: observation.progress,
Expand Down
Loading
Loading