Skip to content

Commit 7531d8a

Browse files
Merge remote-tracking branch 'origin/main' into test/3954-testkit-test-program/matthewgrossman
Signed-off-by: Matthew Grossman <[email protected]>
2 parents b8a1ef3 + 8ed8bf0 commit 7531d8a

50 files changed

Lines changed: 1255 additions & 614 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/create-security-advisory/SKILL.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
Prepare every report with the required [advisory template](assets/advisory-template.md);
1111
keep GitHub metadata separate from its description.
1212

13+
Keep the [private reporting form](../../../.github/VULNERABILITY_REPORT.yml) and
14+
the template aligned when changing report requirements.
15+
1316
## Scope and privacy
1417

1518
Follow the repository's current [SECURITY.md](../../../SECURITY.md). This contributor

‎.agents/skills/create-security-advisory/assets/advisory-template.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ revision. State who verified what and any failed attempts or limitations.}}
2828
## Additional details
2929

3030
{{Optional: include supported details that help review, such as the root cause,
31-
severity rationale and CVSS/CWE, a proposed fix or verified workaround, known
32-
unaffected deployments, or a related private PR. Omit this section if none are available.}}
31+
severity rationale and CVSS/CWE, existing CVE identifiers, disclosure deadlines,
32+
a proposed fix or verified workaround, known unaffected deployments, or a related
33+
private PR. Omit this section if none are available.}}
3334

3435
## Open questions
3536

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ tag, or start a second `Pre-release` run for a tag; it has no concurrency guard.
4141
- `Release` (`release.yml`) is dispatched by hand with the stable version. It
4242
picks the highest `-pre.N` on `main` whose whole `Pre-release` run passed,
4343
creates the stable tag on that commit, and publishes without requalifying.
44+
- Stable releases publish public schemas to `buf.build/openshell/core` with
45+
the release tag as the label; prereleases skip Buf publication. The Buf
46+
repository must exist and Actions must have a `BUF_TOKEN` secret with write
47+
access. A failed Buf push fails the release run; follow Recovery before
48+
rerunning the failed publication job.
4449

4550
## Setup
4651

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,18 @@ updating a Snap Store support track. Docs retain an
8383
immutable version and advance latest only for a newer version.
8484

8585
Watch the stable release run and report its result.
86+
87+
## PyPI publishing
88+
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.

‎.agents/skills/sync-agent-infra/SKILL.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Run after adding, removing, or renaming a skill or crate; changing issue or PR c
2828
| TUI behavior | `tui-development` |
2929
| Release artifacts or smoke coverage | `test-release-canary` |
3030
| Release cadence, tagging, or qualification workflows | `release-captain` |
31+
| Release workflows or publishers | `release-openshell`, `release-captain`; keep the Release workflows table and the manual-trigger rule in `CI.md` current |
3132
| CI diagnostics | `watch-github-actions` |
3233
| Native Windows builds, runtime, or release branch guidance | `build-openshell-mxc-windows`; keep Windows implementation links on `windows` even in docs merged to `main` |
3334
| Gator supervision | `launch-openshell-gator` |

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ contact_links:
1515
url: https://github.com/NVIDIA/OpenShell/blob/main/SECURITY.md
1616
about: >
1717
Do not report security vulnerabilities through GitHub issues. Follow
18-
the disclosure process in SECURITY.md — report through the NVIDIA PSIRT
19-
web form or email [email protected].
18+
the disclosure process in SECURITY.md — use GitHub's private vulnerability
19+
reporting form.

‎.github/VULNERABILITY_REPORT.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Keep the sections and prompts aligned with
2+
# .agents/skills/create-security-advisory/assets/advisory-template.md.
3+
name: Private vulnerability report
4+
description: Report an OpenShell vulnerability privately using the required advisory template.
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Follow [SECURITY.md](https://github.com/NVIDIA/OpenShell/blob/main/SECURITY.md) and the [advisory template](https://github.com/NVIDIA/OpenShell/blob/main/.agents/skills/create-security-advisory/assets/advisory-template.md).
10+
11+
Review the report and verify its accuracy before submitting. Distinguish reproduced behavior, code inspection, and unverified claims. Remove secrets and personal information from evidence.
12+
13+
- type: textarea
14+
id: summary-and-impact
15+
attributes:
16+
label: Summary and impact
17+
description: Describe what the attacker can do, which security boundary should prevent it, and the demonstrated impact. Separate unverified consequences.
18+
placeholder: Summarize the vulnerability and its impact in two or three sentences.
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
id: scope-and-prerequisites
24+
attributes:
25+
label: Scope and prerequisites
26+
description: Include each item below. Separate the tested revision from confirmed affected releases. For unknowns, state what needs checking.
27+
placeholder: |
28+
- Product and tested version: Component, release or full commit SHA; image digest if relevant.
29+
- Affected versions: Confirmed release range and evidence, or Unknown with the needed check.
30+
- Environment and configuration: Relevant OS, runtime/driver, topology, and exact settings; default or opt-in.
31+
- Attacker access: Starting privileges, controlled input, and resources in scope.
32+
validations:
33+
required: true
34+
35+
- type: textarea
36+
id: reproduction-and-evidence
37+
attributes:
38+
label: Reproduction and evidence
39+
description: Provide reproduction steps and observed results, or concrete code evidence of the attack path. State what was verified and what was not run; scanner output alone is insufficient.
40+
placeholder: |
41+
Verification status: Reproduced / code inspection only / reporter claim not reproduced.
42+
43+
1. Operator setup: Minimal prerequisites, test resources, and copyable commands/configuration.
44+
2. Attacker actions: Exact steps under the privileges stated above.
45+
3. Check: Read back the response or state change that demonstrates the impact.
46+
47+
Expected: Security-preserving behavior; link the applicable policy, contract, or enforcing code.
48+
Observed: Actual result and concise redacted output; if not executed, say so.
49+
50+
Link the source report, private artifacts, and relevant code at an immutable revision.
51+
State who verified what and any failed attempts or limitations.
52+
validations:
53+
required: true
54+
55+
- type: textarea
56+
id: additional-details
57+
attributes:
58+
label: Additional details
59+
description: Include supported optional details that help review. Leave blank if none are available.
60+
placeholder: |
61+
Root cause, severity rationale and CVSS/CWE, existing CVE identifiers,
62+
disclosure deadlines, a proposed fix or verified workaround, known
63+
unaffected deployments, or a related private PR.
64+
validations:
65+
required: false
66+
67+
- type: textarea
68+
id: open-questions
69+
attributes:
70+
label: Open questions
71+
description: List missing evidence that affects the assessment and the next check for each gap. Leave blank if there are no known gaps.
72+
validations:
73+
required: false

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ runs:
7878
shell: bash
7979
env:
8080
CLUSTER_NAME: ${{ inputs.cluster-name }}
81+
CALICO_VERSION: v3.30.3
8182
run: |
8283
set -euo pipefail
8384
collect_cni_diagnostics() {
@@ -98,9 +99,18 @@ runs:
9899
exit "$failure_status"
99100
}
100101
trap collect_cni_diagnostics ERR
101-
curl -fsSL https://raw.githubusercontent.com/projectcalico/calico/v3.30.3/manifests/calico.yaml \
102+
curl -fsSL "https://raw.githubusercontent.com/projectcalico/calico/$CALICO_VERSION/manifests/calico.yaml" \
102103
-o "$RUNNER_TEMP/calico.yaml"
103104
sed '[email protected]/[email protected]/16@g' "$RUNNER_TEMP/calico.yaml" > "$RUNNER_TEMP/calico-kind.yaml"
105+
# The kind node's containerd pulls Docker Hub anonymously and is rate
106+
# limited. The host daemon pulls through the runner's registry mirror.
107+
for component in cni node kube-controllers; do
108+
image="docker.io/calico/$component:$CALICO_VERSION"
109+
archive="$RUNNER_TEMP/calico-$component-linux-amd64.tar"
110+
docker pull --platform linux/amd64 "$image"
111+
docker image save --platform linux/amd64 --output "$archive" "$image"
112+
kind load image-archive "$archive" --name "$CLUSTER_NAME"
113+
done
104114
kubectl --context "kind-$CLUSTER_NAME" apply -f "$RUNNER_TEMP/calico-kind.yaml"
105115
kubectl --context "kind-$CLUSTER_NAME" -n kube-system rollout status daemonset/calico-node --timeout=300s
106116
kubectl --context "kind-$CLUSTER_NAME" -n kube-system rollout status deployment/calico-kube-controllers --timeout=300s

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

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,6 @@ jobs:
292292
id-token: write
293293
attestations: write
294294
artifact-metadata: write
295-
outputs:
296-
wheel_filenames: ${{ steps.wheel_filenames.outputs.wheel_filenames }}
297295
steps:
298296
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
299297

@@ -397,8 +395,7 @@ jobs:
397395
398396
ls -la release/
399397
400-
- name: Capture wheel filenames
401-
id: wheel_filenames
398+
- name: Verify wheel count
402399
run: |
403400
set -euo pipefail
404401
shopt -s nullglob
@@ -407,8 +404,6 @@ jobs:
407404
echo "expected exactly one Python wheel, found ${#wheels[@]}" >&2
408405
exit 1
409406
fi
410-
wheel_filename=$(basename "${wheels[0]}")
411-
echo "wheel_filenames=${wheel_filename}" >> "$GITHUB_OUTPUT"
412407
413408
- name: Generate checksums
414409
run: |
@@ -580,7 +575,7 @@ jobs:
580575

581576
publish-fern-docs:
582577
name: Sync and Publish Fern Docs
583-
needs: [compute-versions, release-dev, release-helm, trigger-wheel-publish]
578+
needs: [compute-versions, release-dev, release-helm]
584579
permissions:
585580
contents: write
586581
uses: ./.github/workflows/sync-docs.yml
@@ -593,40 +588,3 @@ jobs:
593588
publish: true
594589
secrets:
595590
FERN_TOKEN: ${{ secrets.FERN_TOKEN }}
596-
597-
trigger-wheel-publish:
598-
name: Trigger Wheel Publish
599-
needs: [compute-versions, release-dev]
600-
runs-on: [self-hosted, nv]
601-
timeout-minutes: 10
602-
steps:
603-
- name: Trigger GitLab CI
604-
env:
605-
GITLAB_CI_TRIGGER_TOKEN: ${{ secrets.GITLAB_CI_TRIGGER_TOKEN }}
606-
GITLAB_CI_TRIGGER_URL: ${{ secrets.GITLAB_CI_TRIGGER_URL }}
607-
RELEASE_VERSION: ${{ needs.compute-versions.outputs.python_version }}
608-
WHEEL_FILENAMES: ${{ needs.release-dev.outputs.wheel_filenames }}
609-
run: |
610-
set -euo pipefail
611-
if [ -z "${WHEEL_FILENAMES}" ]; then
612-
echo "No wheel filenames provided by build job" >&2
613-
exit 1
614-
fi
615-
616-
response=$(curl -X POST \
617-
--fail \
618-
--silent \
619-
--show-error \
620-
-F "token=${GITLAB_CI_TRIGGER_TOKEN}" \
621-
-F "ref=main" \
622-
-F "variables[PIPELINE_ACTION]=publish_wheels" \
623-
-F "variables[GITHUB_REPOSITORY]=${GITHUB_REPOSITORY}" \
624-
-F "variables[COMMIT_SHA]=${GITHUB_SHA}" \
625-
-F "variables[RELEASE_TAG]=dev" \
626-
-F "variables[RELEASE_VERSION]=${RELEASE_VERSION}" \
627-
-F "variables[RELEASE_KIND]=dev" \
628-
-F "variables[WHEEL_FILENAMES]=${WHEEL_FILENAMES}" \
629-
"${GITLAB_CI_TRIGGER_URL}")
630-
pipeline_id=$(printf '%s' "$response" | sed -n 's/.*"id":\([0-9][0-9]*\).*/\1/p')
631-
pipeline_status=$(printf '%s' "$response" | sed -n 's/.*"status":"\([^"]*\)".*/\1/p')
632-
echo "Triggered GitLab pipeline ${pipeline_id:-unknown} with status=${pipeline_status:-unknown}"

0 commit comments

Comments
 (0)