Skip to content

Commit c7d1d53

Browse files
committed
merge: resolve conflicts with upstream main
- Keep credential stripping functions (PR core feature) - Adopt upstream computeFileDigest (returns null instead of throw) - Adopt upstream .toLowerCase() for case-insensitive basename matching - Adopt upstream "blueprintDigest" in manifest check (more precise) - Add upstream's new test for v3 snapshot without blueprintPath
2 parents 7d72e6d + b42f291 commit c7d1d53

21 files changed

Lines changed: 1148 additions & 156 deletions

‎.github/CODEOWNERS‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# .github/CODEOWNERS
2+
#
3+
# Auto-assigns reviewers to PRs. Each line maps a path pattern to one or more
4+
# GitHub teams. Last matching pattern wins. GitHub round-robins review requests
5+
# within each team to spread the load.
6+
#
7+
# Docs: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
8+
9+
# ── Fallback: maintainers review anything not matched below ──
10+
* @NVIDIA/nemoclaw-maintainer
11+
12+
# ── CLI plugin (Node/TS) ──
13+
/nemoclaw/ @NVIDIA/nemoclaw-maintainer
14+
/nemoclaw/src/onboard/ @NVIDIA/nemoclaw-engineer
15+
16+
# ── Blueprint & sandbox policy (Python) ──
17+
/nemoclaw-blueprint/ @NVIDIA/nemoclaw-maintainer
18+
/nemoclaw-blueprint/policies/ @NVIDIA/nemoclaw-security
19+
20+
# ── Shell scripts & installers ──
21+
/bin/ @NVIDIA/nemoclaw-maintainer
22+
/scripts/ @NVIDIA/nemoclaw-maintainer
23+
/install.sh @NVIDIA/nemoclaw-maintainer
24+
/uninstall.sh @NVIDIA/nemoclaw-maintainer
25+
26+
# ── Container ──
27+
/Dockerfile @NVIDIA/nemoclaw-security @NVIDIA/nemoclaw-maintainer
28+
29+
# ── Docs ──
30+
/docs/ @NVIDIA/nemoclaw-engineer
31+
/spark-install.md @NVIDIA/nemoclaw-engineer
32+
33+
# ── Tests ──
34+
/test/ @NVIDIA/nemoclaw-engineer
35+
36+
# ── CI / GitHub config ──
37+
/.github/ @NVIDIA/nemoclaw-maintainer
38+
/ci/ @NVIDIA/nemoclaw-maintainer

‎.github/workflows/base-image.yaml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# Build and push the sandbox base image to GHCR.
5+
#
6+
# Triggers:
7+
# - Push to main when Dockerfile.base changes (new apt pkgs, openclaw bump, etc.)
8+
# - Manual dispatch for ad-hoc rebuilds
9+
#
10+
# The base image contains the expensive, rarely-changing layers (apt, gosu,
11+
# user setup, openclaw CLI). The production Dockerfile layers PR-specific
12+
# code on top via: FROM ghcr.io/nvidia/nemoclaw/sandbox-base:<tag>
13+
14+
name: base-image
15+
16+
on:
17+
push:
18+
branches: [main]
19+
paths:
20+
- "Dockerfile.base"
21+
workflow_dispatch:
22+
23+
permissions:
24+
contents: read
25+
packages: write
26+
27+
concurrency:
28+
group: base-image
29+
cancel-in-progress: true
30+
31+
env:
32+
REGISTRY: ghcr.io
33+
IMAGE_NAME: nvidia/nemoclaw/sandbox-base
34+
35+
jobs:
36+
build-and-push:
37+
if: github.repository == 'NVIDIA/NemoClaw'
38+
runs-on: ubuntu-latest
39+
timeout-minutes: 15
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v6
43+
44+
- name: Set up Docker Buildx
45+
uses: docker/setup-buildx-action@v3
46+
47+
- name: Log in to GHCR
48+
uses: docker/login-action@v3
49+
with:
50+
registry: ${{ env.REGISTRY }}
51+
username: ${{ github.actor }}
52+
password: ${{ secrets.GITHUB_TOKEN }}
53+
54+
- name: Extract metadata
55+
id: meta
56+
uses: docker/metadata-action@v5
57+
with:
58+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
59+
tags: |
60+
type=raw,value=latest
61+
type=sha,prefix=,format=short
62+
63+
- name: Build and push
64+
uses: docker/build-push-action@v6
65+
with:
66+
context: .
67+
file: Dockerfile.base
68+
push: true
69+
tags: ${{ steps.meta.outputs.tags }}
70+
labels: ${{ steps.meta.outputs.labels }}
71+
cache-from: type=gha
72+
cache-to: type=gha,mode=max

‎.github/workflows/docker-pin-check.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ jobs:
2525
uses: actions/checkout@v6
2626

2727
- name: Check Dockerfile base-image pin
28-
run: bash scripts/update-docker-pin.sh --check
28+
run: |
29+
bash scripts/update-docker-pin.sh --check
30+
DOCKERFILE=Dockerfile.base bash scripts/update-docker-pin.sh --check

‎.github/workflows/nightly-e2e.yaml‎

Lines changed: 101 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33
#
4-
# Nightly full E2E: install → onboard → live inference against NVIDIA Endpoint API.
4+
# Nightly E2E tests:
5+
#
6+
# cloud-e2e Cloud inference (NVIDIA Endpoint API) on ubuntu-latest.
7+
# cloud-experimental-e2e Experimental cloud inference test.
8+
# gpu-e2e Local Ollama inference on a GPU self-hosted runner.
9+
# Controlled by the GPU_E2E_ENABLED repository variable.
10+
# Set vars.GPU_E2E_ENABLED to "true" in repo settings to enable.
11+
# notify-on-failure Auto-creates a GitHub issue when any E2E job fails.
12+
#
513
# Runs directly on the runner (not inside Docker) because OpenShell bootstraps
614
# a K3s cluster inside a privileged Docker container — nesting would break networking.
715
#
8-
# Requires NVIDIA_API_KEY repository secret.
16+
# Requires NVIDIA_API_KEY repository secret (for cloud-e2e and cloud-experimental-e2e).
917
# Only runs on schedule and manual dispatch — never on PRs (secret protection).
1018

1119
name: nightly-e2e
@@ -23,15 +31,15 @@ concurrency:
2331
cancel-in-progress: true
2432

2533
jobs:
26-
full-e2e:
34+
cloud-e2e:
2735
if: github.repository == 'NVIDIA/NemoClaw'
2836
runs-on: ubuntu-latest
2937
timeout-minutes: 45
3038
steps:
3139
- name: Checkout
3240
uses: actions/checkout@v6
3341

34-
- name: Run full E2E test
42+
- name: Run cloud E2E test
3543
env:
3644
NVIDIA_API_KEY: ${{ secrets.NVIDIA_API_KEY }}
3745
NEMOCLAW_NON_INTERACTIVE: "1"
@@ -76,3 +84,92 @@ jobs:
7684
name: install-log-cloud-experimental
7785
path: /tmp/nemoclaw-e2e-install.log
7886
if-no-files-found: ignore
87+
88+
# ── GPU E2E (Ollama local inference) ──────────────────────────
89+
# Enable by setting repository variable GPU_E2E_ENABLED=true
90+
# (Settings → Secrets and variables → Actions → Variables)
91+
#
92+
# Runner labels: using 'self-hosted' for now. Refine to
93+
# [self-hosted, linux, x64, gpu] once NVIDIA runner labels are confirmed.
94+
gpu-e2e:
95+
if: github.repository == 'NVIDIA/NemoClaw' && vars.GPU_E2E_ENABLED == 'true'
96+
runs-on: self-hosted
97+
timeout-minutes: 60
98+
env:
99+
NEMOCLAW_NON_INTERACTIVE: "1"
100+
NEMOCLAW_SANDBOX_NAME: "e2e-gpu-ollama"
101+
NEMOCLAW_RECREATE_SANDBOX: "1"
102+
NEMOCLAW_PROVIDER: "ollama"
103+
steps:
104+
- name: Checkout
105+
uses: actions/checkout@v6
106+
107+
- name: Verify GPU availability
108+
run: |
109+
echo "=== GPU Info ==="
110+
nvidia-smi
111+
echo ""
112+
echo "=== VRAM ==="
113+
nvidia-smi --query-gpu=name,memory.total --format=csv,noheader
114+
echo ""
115+
echo "=== Docker ==="
116+
docker info --format '{{.ServerVersion}}'
117+
118+
- name: Run GPU E2E test (Ollama local inference)
119+
run: bash test/e2e/test-gpu-e2e.sh
120+
121+
- name: Upload install log on failure
122+
if: failure()
123+
uses: actions/upload-artifact@v4
124+
with:
125+
name: gpu-e2e-install-log
126+
path: /tmp/nemoclaw-gpu-e2e-install.log
127+
if-no-files-found: ignore
128+
129+
- name: Upload test log on failure
130+
if: failure()
131+
uses: actions/upload-artifact@v4
132+
with:
133+
name: gpu-e2e-test-log
134+
path: /tmp/nemoclaw-gpu-e2e-test.log
135+
if-no-files-found: ignore
136+
137+
notify-on-failure:
138+
runs-on: ubuntu-latest
139+
needs: [cloud-e2e, cloud-experimental-e2e, gpu-e2e]
140+
if: ${{ always() && (needs.cloud-e2e.result == 'failure' || needs.cloud-experimental-e2e.result == 'failure' || needs.gpu-e2e.result == 'failure') }}
141+
permissions:
142+
issues: write
143+
steps:
144+
- name: Create or update failure issue
145+
uses: actions/github-script@v7
146+
with:
147+
script: |
148+
const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
149+
const title = 'Nightly E2E failed';
150+
151+
const { data: existing } = await github.rest.issues.listForRepo({
152+
owner: context.repo.owner,
153+
repo: context.repo.repo,
154+
state: 'open',
155+
labels: 'CI/CD',
156+
per_page: 100,
157+
});
158+
const match = existing.find(i => !i.pull_request && i.title.startsWith(title));
159+
160+
if (match) {
161+
await github.rest.issues.createComment({
162+
owner: context.repo.owner,
163+
repo: context.repo.repo,
164+
issue_number: match.number,
165+
body: `Failed again on ${new Date().toISOString().split('T')[0]}.\n\n**Run:** ${runUrl}\n**Artifacts:** Check the run artifacts for install/test logs (artifact names vary by job).`,
166+
});
167+
} else {
168+
await github.rest.issues.create({
169+
owner: context.repo.owner,
170+
repo: context.repo.repo,
171+
title: `${title} — ${new Date().toISOString().split('T')[0]}`,
172+
body: `The nightly E2E pipeline failed.\n\n**Run:** ${runUrl}\n**Artifacts:** Check the run artifacts for install/test logs (artifact names vary by job).`,
173+
labels: ['bug', 'CI/CD'],
174+
});
175+
}

‎.github/workflows/pr.yaml‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,18 @@ jobs:
8282
- name: Checkout
8383
uses: actions/checkout@v6
8484

85+
- name: Pull base image from GHCR (fall back to local build)
86+
run: |
87+
if docker pull ghcr.io/nvidia/nemoclaw/sandbox-base:latest 2>/dev/null; then
88+
echo "BASE_IMAGE=ghcr.io/nvidia/nemoclaw/sandbox-base:latest" >> "$GITHUB_ENV"
89+
else
90+
echo "::warning::GHCR base image not available, building locally"
91+
docker build -f Dockerfile.base -t nemoclaw-sandbox-base-local .
92+
echo "BASE_IMAGE=nemoclaw-sandbox-base-local" >> "$GITHUB_ENV"
93+
fi
94+
8595
- name: Build production image
86-
run: docker build -t nemoclaw-production .
96+
run: docker build --build-arg BASE_IMAGE=${{ env.BASE_IMAGE }} -t nemoclaw-production .
8797

8898
- name: Build sandbox test image (fixtures layered on production)
8999
run: docker build -f test/Dockerfile.sandbox --build-arg BASE_IMAGE=nemoclaw-production -t nemoclaw-sandbox-test .
@@ -114,8 +124,18 @@ jobs:
114124
- name: Checkout
115125
uses: actions/checkout@v6
116126

127+
- name: Pull base image from GHCR (fall back to local build)
128+
run: |
129+
if docker pull ghcr.io/nvidia/nemoclaw/sandbox-base:latest 2>/dev/null; then
130+
echo "BASE_IMAGE=ghcr.io/nvidia/nemoclaw/sandbox-base:latest" >> "$GITHUB_ENV"
131+
else
132+
echo "::warning::GHCR base image not available, building locally"
133+
docker build -f Dockerfile.base -t nemoclaw-sandbox-base-local .
134+
echo "BASE_IMAGE=nemoclaw-sandbox-base-local" >> "$GITHUB_ENV"
135+
fi
136+
117137
- name: Build production image on arm64
118-
run: docker build -t nemoclaw-production-arm64 .
138+
run: docker build --build-arg BASE_IMAGE=${{ env.BASE_IMAGE }} -t nemoclaw-production-arm64 .
119139

120140
- name: Build sandbox test image on arm64
121141
run: docker build -f test/Dockerfile.sandbox --build-arg BASE_IMAGE=nemoclaw-production-arm64 -t nemoclaw-sandbox-test-arm64 .

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Thumbs.db
1515

1616
# Project-specific
1717
draft_newsletter_*
18+
research/
1819
specs/
1920
vdr-notes/
2021

0 commit comments

Comments
 (0)