Skip to content

Commit 78230a2

Browse files
committed
Merge upstream/main into feat/cursor-harness
Resolves 6 conflicts -- all parallel additions (cursor harness content landing in the same areas as upstream changes): - .github/workflows/images.yml: bump checkout to v7.0.1, bump podman-login hash, add Setup podman step to cursor-runner and cursor-sandbox jobs; drop build-openshell-supervisor from e2e needs list and drop SUPERVISOR_IMAGE env var - .github/workflows/images-dev.yml: same action bumps + Setup podman for build-cursor-sandbox; drop build-openshell-supervisor job - Makefile: keep openshell-cursor-build, drop openshell-supervisor-build - AGENTS.md: use upstream's updated opencode sandbox comment, keep cursor make target, drop supervisor make target - docs/image/build.md: use upstream's detailed opencode-sandbox description, add cursor rows and cursor make commands - tests/test_podman.py: concatenate all new tests from both sides; remove now-redundant inline `import subprocess` (top-level import added by upstream covers it) Refs: NVIDIA/OpenShell#2426
2 parents db61265 + 34ee9d0 commit 78230a2

35 files changed

Lines changed: 688 additions & 443 deletions

‎.claude/skills/debug-agentic-ci/references/symptoms.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@ Known failure patterns from this repo's history. Update this file when fixing bu
6969
### OpenShell sandbox auto-attaches provider
7070
- **Likely cause**: Default provider attachment behavior interfered with custom credential injection. Fixed by preventing auto-attachment.
7171
- **Where to look**: `backends/openshell/sandbox.py` provider config
72+
73+
### agentic-ci fails to run in OpenShell image (Python too old)
74+
- **Likely cause**: UBI9 defaults `python3` to 3.9; agentic-ci needs 3.10+. The images install `python3.12` and symlink it as the default `python3`/`python` in `/usr/local/bin`. A missing symlink or missing `python3.12` breaks the `uv pip install --system` step.
75+
- **Where to look**: `images/ci/Containerfile.openshell`, `images/runner/shared/Containerfile.openshell-base` python setup

‎.claude/skills/test-e2e-openshell/SKILL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ to confirm or override each one before proceeding:
2121
| Role | Default image | Variable |
2222
|--------------------|--------------------------------------------------------|-----------------------------|
2323
| CI image | `quay.io/aipcc/agentic-ci/openshell` | `$CI_IMAGE` |
24-
| Supervisor | `quay.io/aipcc/agentic-ci/openshell-supervisor` | `$SUPERVISOR_IMAGE` |
24+
| Supervisor | `quay.io/opendatahub/odh-openshell-supervisor` | `$SUPERVISOR_IMAGE` |
2525
| Claude sandbox | `quay.io/aipcc/agentic-ci/claude-sandbox` | `$CLAUDE_SANDBOX_IMAGE` |
2626
| OpenCode sandbox | `quay.io/aipcc/agentic-ci/opencode-sandbox` | `$OPENCODE_SANDBOX_IMAGE` |
2727
| Cursor sandbox | `quay.io/aipcc/agentic-ci/cursor-sandbox` | `$CURSOR_SANDBOX_IMAGE` |
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Workaround for crun "unknown version specified" on GitHub Actions runners.
2+
# The runner image ships a crun build incompatible with podman 5.8.x.
3+
# Configuring podman to use runc (available from containerd) sidesteps it.
4+
# Remove this action once the runner image is fixed.
5+
name: Setup podman runtime
6+
description: Configure podman to use runc as OCI runtime
7+
8+
runs:
9+
using: composite
10+
steps:
11+
- name: Configure podman to use runc
12+
shell: bash
13+
run: |
14+
set -euo pipefail
15+
sudo mkdir -p /etc/containers
16+
printf '[engine]\nruntime = "runc"\n' | sudo tee /etc/containers/containers.conf
17+
podman info --format 'Runtime: {{.Host.OCIRuntime.Name}} {{.Host.OCIRuntime.Path}}'

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
tox:
66
name: Run Tox
77
steps:
8-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
99
with:
1010
fetch-depth: 0
1111
fetch-tags: true
@@ -22,12 +22,12 @@ jobs:
2222
mlflow-e2e:
2323
name: MLflow E2E
2424
steps:
25-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
25+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2626
with:
2727
fetch-depth: 0
2828
fetch-tags: true
2929
persist-credentials: false
30-
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
30+
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
3131
with:
3232
python-version: "3.12"
3333
- name: Run MLflow E2E tests

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
16-
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
15+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
16+
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
1717
with:
1818
python-version: "3.13"
1919
- run: pip install -e '.[docs]'

‎.github/workflows/images-dev.yml‎

Lines changed: 37 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Rebuilds all container images every 6 hours with --no-cache to pick up
44
# the latest unpinned dependencies (skills from skills-registry, RPM
5-
# updates). Tags images as <next-patch>.dev (e.g. 0.3.20.dev) so dev
5+
# updates). Tags images as <next-patch>.dev0 (e.g. 0.3.20.dev0) so dev
66
# builds are clearly distinguishable from releases.
77
#
88
# Ref: RHAIFIRST-219
@@ -40,7 +40,7 @@ jobs:
4040
dev_tag: ${{ steps.tag.outputs.dev_tag }}
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
43+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4444
with:
4545
fetch-depth: 0
4646
fetch-tags: true
@@ -65,12 +65,15 @@ jobs:
6565
contents: read
6666
steps:
6767
- name: Checkout
68-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
68+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6969
with:
7070
persist-credentials: false
7171

72+
- name: Setup podman
73+
uses: ./.github/actions/setup-podman
74+
7275
- name: Log in to quay.io
73-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
76+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
7477
with:
7578
registry: ${{ env.REGISTRY }}
7679
username: ${{ secrets.QUAY_USERNAME }}
@@ -109,12 +112,15 @@ jobs:
109112
contents: read
110113
steps:
111114
- name: Checkout
112-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
115+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
113116
with:
114117
persist-credentials: false
115118

119+
- name: Setup podman
120+
uses: ./.github/actions/setup-podman
121+
116122
- name: Log in to quay.io
117-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
123+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
118124
with:
119125
registry: ${{ env.REGISTRY }}
120126
username: ${{ secrets.QUAY_USERNAME }}
@@ -197,12 +203,15 @@ jobs:
197203
contents: read
198204
steps:
199205
- name: Checkout
200-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
206+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
201207
with:
202208
persist-credentials: false
203209

210+
- name: Setup podman
211+
uses: ./.github/actions/setup-podman
212+
204213
- name: Log in to quay.io
205-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
214+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
206215
with:
207216
registry: ${{ env.REGISTRY }}
208217
username: ${{ secrets.QUAY_USERNAME }}
@@ -232,12 +241,15 @@ jobs:
232241
contents: read
233242
steps:
234243
- name: Checkout
235-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
244+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
236245
with:
237246
persist-credentials: false
238247

248+
- name: Setup podman
249+
uses: ./.github/actions/setup-podman
250+
239251
- name: Log in to quay.io
240-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
252+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
241253
with:
242254
registry: ${{ env.REGISTRY }}
243255
username: ${{ secrets.QUAY_USERNAME }}
@@ -273,23 +285,20 @@ jobs:
273285
contents: read
274286
steps:
275287
- name: Checkout
276-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
288+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
277289
with:
278290
persist-credentials: false
279291

292+
- name: Setup podman
293+
uses: ./.github/actions/setup-podman
294+
280295
- name: Log in to quay.io
281-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
296+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
282297
with:
283298
registry: ${{ env.REGISTRY }}
284299
username: ${{ secrets.QUAY_USERNAME }}
285300
password: ${{ secrets.QUAY_PASSWORD }}
286301

287-
- name: Build openshell-base
288-
run: |
289-
podman build --no-cache -t localhost/openshell-base:latest \
290-
-f images/runner/shared/Containerfile.openshell-base \
291-
.
292-
293302
- name: Build and push opencode-sandbox
294303
env:
295304
DEV_TAG: ${{ needs.compute-tag.outputs.dev_tag }}
@@ -314,12 +323,15 @@ jobs:
314323
contents: read
315324
steps:
316325
- name: Checkout
317-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
326+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
318327
with:
319328
persist-credentials: false
320329

330+
- name: Setup podman
331+
uses: ./.github/actions/setup-podman
332+
321333
- name: Log in to quay.io
322-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
334+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
323335
with:
324336
registry: ${{ env.REGISTRY }}
325337
username: ${{ secrets.QUAY_USERNAME }}
@@ -343,41 +355,6 @@ jobs:
343355
.
344356
podman push "${IMAGE_NAME}:${DEV_TAG}"
345357
346-
# --------------------------------------------------------------------------
347-
# openshell-supervisor
348-
# --------------------------------------------------------------------------
349-
build-openshell-supervisor:
350-
name: Build openshell-supervisor (dev)
351-
needs: compute-tag
352-
runs-on: ubuntu-latest
353-
timeout-minutes: 60
354-
permissions:
355-
contents: read
356-
steps:
357-
- name: Checkout
358-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
359-
with:
360-
persist-credentials: false
361-
362-
- name: Log in to quay.io
363-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
364-
with:
365-
registry: ${{ env.REGISTRY }}
366-
username: ${{ secrets.QUAY_USERNAME }}
367-
password: ${{ secrets.QUAY_PASSWORD }}
368-
369-
- name: Build and push openshell-supervisor
370-
env:
371-
DEV_TAG: ${{ needs.compute-tag.outputs.dev_tag }}
372-
run: |
373-
set -euo pipefail
374-
IMAGE_NAME="${IMAGE_PREFIX}/openshell-supervisor"
375-
podman build --no-cache \
376-
-t "${IMAGE_NAME}:${DEV_TAG}" \
377-
-f images/openshell-supervisor/Containerfile \
378-
.
379-
podman push "${IMAGE_NAME}:${DEV_TAG}"
380-
381358
# --------------------------------------------------------------------------
382359
# ci-openshell
383360
# --------------------------------------------------------------------------
@@ -390,12 +367,15 @@ jobs:
390367
contents: read
391368
steps:
392369
- name: Checkout
393-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
370+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
394371
with:
395372
persist-credentials: false
396373

374+
- name: Setup podman
375+
uses: ./.github/actions/setup-podman
376+
397377
- name: Log in to quay.io
398-
uses: redhat-actions/podman-login@2e76993ec4585e058ea832c23ee3d885970936af # v1 (node24)
378+
uses: redhat-actions/podman-login@028bf4466edb33d710e06e7d9e95461945086656 # v1 (node24)
399379
with:
400380
registry: ${{ env.REGISTRY }}
401381
username: ${{ secrets.QUAY_USERNAME }}

‎.github/workflows/images-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2929
with:
3030
persist-credentials: false
3131

3232
- name: Install shellcheck
3333
run: sudo apt-get update && sudo apt-get install -y shellcheck
3434

3535
- name: Set up uv
36-
uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
36+
uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
3737

3838
- name: Run shellcheck
3939
run: |
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- name: Checkout
58-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
58+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5959
with:
6060
persist-credentials: false
6161

0 commit comments

Comments
 (0)