Skip to content

Commit f4da56b

Browse files
committed
test(conformance): run driver suites with cargo
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 3d1fd5b commit f4da56b

20 files changed

Lines changed: 94 additions & 505 deletions

File tree

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

4-
inputs:
5-
conformance-artifact-prefix:
6-
description: Optional conformance CLI artifact name prefix; linux-<arch> is appended automatically
7-
required: false
8-
default: ""
9-
104
runs:
115
using: composite
126
steps:
@@ -23,27 +17,3 @@ runs:
2317
chmod +x "$cli"
2418
"$cli" --version
2519
echo "OPENSHELL_BIN=$cli" >> "$GITHUB_ENV"
26-
27-
- name: Download prebuilt conformance CLI
28-
if: inputs.conformance-artifact-prefix != ''
29-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
30-
with:
31-
name: ${{ format('{0}-{1}', inputs.conformance-artifact-prefix, runner.arch == 'X64' && 'x86_64-unknown-linux-musl' || 'aarch64-unknown-linux-musl') }}
32-
path: .e2e/prebuilt-conformance
33-
34-
- name: Configure prebuilt conformance CLI
35-
if: inputs.conformance-artifact-prefix != ''
36-
shell: bash
37-
run: | # zizmor: ignore[github-env] validated filename under the trusted workspace path
38-
set -euo pipefail
39-
conformance="$GITHUB_WORKSPACE/.e2e/prebuilt-conformance/openshell-conformance"
40-
if [[ ! -f "$conformance" ]]; then
41-
echo "downloaded artifact is missing $conformance" >&2
42-
exit 1
43-
fi
44-
# TODO: Remove this temporary mode diagnostic after CI confirms artifact permission handling.
45-
echo "conformance binary mode before chmod: $(ls -l "$conformance")"
46-
chmod +x "$conformance"
47-
echo "conformance binary mode after chmod: $(ls -l "$conformance")"
48-
"$conformance" list --output json >/dev/null
49-
echo "OPENSHELL_CONFORMANCE_BIN=$conformance" >> "$GITHUB_ENV"

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ jobs:
276276
with:
277277
image-tag: ${{ github.sha }}
278278
runner: linux-arm64-cpu8
279-
conformance-artifact-prefix: openshell-conformance
280279

281280
podman-e2e:
282281
needs: [pr_metadata, build-binaries, build-images]
@@ -288,7 +287,6 @@ jobs:
288287
uses: ./.github/workflows/e2e-podman-test.yml
289288
with:
290289
image-tag: ${{ github.sha }}
291-
conformance-artifact-prefix: openshell-conformance
292290
suite-matrix: >-
293291
[{"suite":"ci","runner":"ubuntu-26.04","podman_major":"5","podman_package_version":"5.7.0+ds2-3build1","conmon_package_version":"2.1.13+ds1-2","cmd":"mise run --no-deps --skip-deps e2e:podman:ci"}]
294292
@@ -300,8 +298,6 @@ jobs:
300298
contents: read
301299
packages: read
302300
uses: ./.github/workflows/e2e-vm-test.yml
303-
with:
304-
conformance-artifact-prefix: openshell-conformance
305301

306302
docker-external-driver-e2e:
307303
needs: [pr_metadata, build-binaries, build-gateway-plain, build-external-drivers, build-images]
@@ -316,7 +312,6 @@ jobs:
316312
runner: linux-arm64-cpu8
317313
gateway-artifact: openshell-gateway-plain-aarch64-unknown-linux-gnu
318314
external-driver-binary: openshell-driver-docker
319-
conformance-artifact-prefix: openshell-conformance
320315
suite-matrix: >-
321316
[{"suite":"external-driver","cmd":"mise run --no-deps --skip-deps e2e:docker:external-driver","apt_packages":"openssh-client","python_proto":false,"mcp":false}]
322317
@@ -332,7 +327,6 @@ jobs:
332327
image-tag: ${{ github.sha }}
333328
gateway-artifact: openshell-gateway-plain-x86_64-unknown-linux-gnu
334329
external-driver-binary: openshell-driver-podman
335-
conformance-artifact-prefix: openshell-conformance
336330
suite-matrix: >-
337331
[{"suite":"external-driver","runner":"ubuntu-26.04","podman_major":"5","podman_package_version":"5.7.0+ds2-3build1","conmon_package_version":"2.1.13+ds1-2","cmd":"mise run --no-deps --skip-deps e2e:podman:external-driver"}]
338332
@@ -348,7 +342,6 @@ jobs:
348342
gateway-artifact: openshell-gateway-plain-x86_64-unknown-linux-gnu
349343
suite-name: external-driver
350344
e2e-task: e2e:vm:external-driver
351-
conformance-artifact-prefix: openshell-conformance
352345

353346
gpu-e2e:
354347
needs: [pr_metadata, build-binaries, build-images]
@@ -360,7 +353,6 @@ jobs:
360353
uses: ./.github/workflows/e2e-gpu-test.yaml
361354
with:
362355
image-tag: ${{ github.sha }}
363-
conformance-artifact-prefix: openshell-conformance
364356

365357
kubernetes-e2e:
366358
needs: [pr_metadata, build-binaries, build-images]
@@ -382,7 +374,6 @@ jobs:
382374
image-tag: ${{ github.sha }}
383375
job-name: Kubernetes E2E (Rust smoke, Agent Sandbox ${{ matrix.agent_sandbox_api }})
384376
agent-sandbox-version: ${{ matrix.agent_sandbox_version }}
385-
conformance-artifact-prefix: openshell-conformance
386377

387378
kubernetes-workspace-managed-e2e:
388379
needs: [pr_metadata, build-binaries, build-images]
@@ -396,7 +387,6 @@ jobs:
396387
image-tag: ${{ github.sha }}
397388
job-name: Kubernetes E2E (workspace managed mode)
398389
e2e-task: e2e:kubernetes:workspace-managed
399-
conformance-artifact-prefix: openshell-conformance
400390

401391
kubernetes-external-driver-e2e:
402392
needs: [pr_metadata, build-binaries, build-gateway-plain, build-external-drivers, build-images]
@@ -413,7 +403,6 @@ jobs:
413403
gateway-artifact: openshell-gateway-plain-x86_64-unknown-linux-gnu
414404
external-driver-binary: openshell-driver-kubernetes
415405
cluster-images: sandbox supervisor
416-
conformance-artifact-prefix: openshell-conformance
417406

418407
kubernetes-workspace-operator-e2e:
419408
needs: [pr_metadata, build-binaries, build-images]
@@ -427,7 +416,6 @@ jobs:
427416
image-tag: ${{ github.sha }}
428417
job-name: Kubernetes E2E (workspace operator mode)
429418
e2e-task: e2e:kubernetes:workspace-operator
430-
conformance-artifact-prefix: openshell-conformance
431419

432420
kubernetes-ha-e2e:
433421
needs: [pr_metadata, build-binaries, build-images]
@@ -445,7 +433,6 @@ jobs:
445433
test-name: kubernetes_ha_rebalancing
446434
kubernetes-features: e2e,e2e-host-gateway,e2e-kubernetes,e2e-kubernetes-ha
447435
use-envoy-gateway: true
448-
conformance-artifact-prefix: openshell-conformance
449436

450437
kubernetes-credential-drivers-e2e:
451438
needs: [pr_metadata, build-binaries, build-images]
@@ -459,7 +446,6 @@ jobs:
459446
image-tag: ${{ github.sha }}
460447
job-name: Kubernetes Credential Drivers E2E
461448
e2e-task: e2e:kubernetes:credential-drivers
462-
conformance-artifact-prefix: openshell-conformance
463449

464450
core-e2e-result:
465451
name: Core E2E result

‎.github/workflows/build-binaries.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,6 @@ jobs:
6161
supervisor-image-tag: ${{ inputs.supervisor-image-tag }}
6262
extra-cargo-flags: ${{ env.EXTRA_CARGO_FLAGS }}
6363

64-
conformance:
65-
name: openshell-conformance (${{ matrix.triple }})
66-
env:
67-
PACKAGE: openshell-conformance-cli
68-
BINARY: openshell-conformance
69-
strategy:
70-
matrix:
71-
include:
72-
- triple: x86_64-unknown-linux-musl
73-
runner: linux-amd64-cpu8
74-
- triple: aarch64-unknown-linux-musl
75-
runner: linux-arm64-cpu8
76-
runs-on: ${{ matrix.runner }}
77-
timeout-minutes: 60
78-
steps: *build_steps
79-
8064
prover:
8165
name: openshell-prover (${{ matrix.triple }})
8266
env:

‎.github/workflows/e2e-docker-test.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ on:
2525
required: false
2626
type: string
2727
default: ""
28-
conformance-artifact-prefix:
29-
required: false
30-
type: string
31-
default: ""
3228
suite-matrix:
3329
required: false
3430
type: string
@@ -71,8 +67,6 @@ jobs:
7167
persist-credentials: false
7268

7369
- uses: ./.github/actions/setup-e2e-cli
74-
with:
75-
conformance-artifact-prefix: ${{ inputs.conformance-artifact-prefix }}
7670

7771
- uses: ./.github/actions/setup-e2e-gateway
7872
with:

‎.github/workflows/e2e-gpu-test.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ on:
77
description: "Image tag to test (typically the commit SHA)"
88
required: true
99
type: string
10-
conformance-artifact-prefix:
11-
description: "Optional prebuilt conformance CLI artifact prefix (artifact suffix is <triple>)"
12-
required: false
13-
type: string
14-
default: ""
1510

1611
permissions:
1712
actions: read
@@ -66,8 +61,6 @@ jobs:
6661

6762
- name: Use prebuilt OpenShell CLI
6863
uses: ./.github/actions/setup-e2e-cli
69-
with:
70-
conformance-artifact-prefix: ${{ inputs.conformance-artifact-prefix }}
7164

7265
- name: Use prebuilt OpenShell gateway
7366
uses: ./.github/actions/setup-e2e-gateway

‎.github/workflows/e2e-kubernetes-test.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ on:
6767
required: false
6868
type: string
6969
default: ""
70-
conformance-artifact-prefix:
71-
description: "Optional prebuilt conformance CLI artifact prefix (artifact suffix is <triple>)"
72-
required: false
73-
type: string
74-
default: ""
7570
external-driver-binary:
7671
description: "Optional standalone compute driver binary used to compose a local test image"
7772
required: false
@@ -112,8 +107,6 @@ jobs:
112107

113108
- name: Use prebuilt OpenShell CLI
114109
uses: ./.github/actions/setup-e2e-cli
115-
with:
116-
conformance-artifact-prefix: ${{ inputs.conformance-artifact-prefix }}
117110

118111
- name: Use prebuilt OpenShell gateway
119112
if: inputs.gateway-artifact != ''

‎.github/workflows/e2e-podman-test.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ on:
2121
required: false
2222
type: string
2323
default: ""
24-
conformance-artifact-prefix:
25-
required: false
26-
type: string
27-
default: ""
2824
suite-matrix:
2925
required: true
3026
type: string
@@ -56,8 +52,6 @@ jobs:
5652
persist-credentials: false
5753

5854
- uses: ./.github/actions/setup-e2e-cli
59-
with:
60-
conformance-artifact-prefix: ${{ inputs.conformance-artifact-prefix }}
6155

6256
- uses: ./.github/actions/setup-e2e-gateway
6357
with:

‎.github/workflows/e2e-vm-test.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ on:
2222
required: false
2323
type: string
2424
default: e2e:vm
25-
conformance-artifact-prefix:
26-
required: false
27-
type: string
28-
default: ""
2925

3026
permissions:
3127
actions: read
@@ -47,8 +43,6 @@ jobs:
4743
persist-credentials: false
4844

4945
- uses: ./.github/actions/setup-e2e-cli
50-
with:
51-
conformance-artifact-prefix: ${{ inputs.conformance-artifact-prefix }}
5246

5347
- uses: ./.github/actions/setup-e2e-gateway
5448
with:

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ jobs:
151151
image-tag: ${{ github.sha }}
152152
checkout-ref: ${{ github.sha }}
153153
runner: linux-arm64-cpu8
154-
conformance-artifact-prefix: openshell-conformance
155154

156155
vm-e2e:
157156
needs: [build-binaries, build-vm-driver]
@@ -162,7 +161,6 @@ jobs:
162161
uses: ./.github/workflows/e2e-vm-test.yml
163162
with:
164163
checkout-ref: ${{ github.sha }}
165-
conformance-artifact-prefix: openshell-conformance
166164

167165
tag-ghcr-dev:
168166
name: Tag GHCR Images as Dev

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ jobs:
201201
image-tag: ${{ needs.compute-versions.outputs.source_sha }}
202202
checkout-ref: ${{ needs.compute-versions.outputs.source_sha }}
203203
runner: linux-arm64-cpu8
204-
conformance-artifact-prefix: openshell-conformance
205204

206205
vm-e2e:
207206
needs: [compute-versions, build-binaries, build-vm-driver]
@@ -212,7 +211,6 @@ jobs:
212211
uses: ./.github/workflows/e2e-vm-test.yml
213212
with:
214213
checkout-ref: ${{ needs.compute-versions.outputs.source_sha }}
215-
conformance-artifact-prefix: openshell-conformance
216214

217215
qualification-result:
218216
name: Release Qualification

0 commit comments

Comments
 (0)