Skip to content

Commit 4d06c6d

Browse files
authored
chore(test-guest): remove snap reproduction helper (#4368)
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent e1f3c82 commit 4d06c6d

3 files changed

Lines changed: 0 additions & 224 deletions

File tree

‎nix/test-guest/README.md‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -296,44 +296,6 @@ nix run .#test-guest -- \
296296
-- openshell --version
297297
```
298298

299-
## Reproduce Snap installation
300-
301-
Copy the repository installer and reproduction script into a prepared Ubuntu
302-
guest. The script follows both Release Canary Snap flows: it runs `install.sh`
303-
with `OPENSHELL_VERSION=dev`, checks the `latest/edge` channel and Docker
304-
interface, and exercises a sandbox. Repeated attempts also cover the installer's
305-
idempotent Snap refresh path. On each failure the script prints snapd, Docker,
306-
and gateway diagnostics.
307-
308-
Reuse system Docker and verify that the Docker snap is not installed:
309-
310-
```shell
311-
nix run .#test-guest -- \
312-
--distro ubuntu-24-04 \
313-
--with docker \
314-
--with snapd \
315-
--keep \
316-
--copy ./install.sh:/tmp/install.sh \
317-
--copy ./nix/test-guest/scripts/snap-gateway-repro.sh:/usr/local/bin/snap-gateway-repro \
318-
-- /usr/local/bin/snap-gateway-repro /tmp/install.sh system-docker 10
319-
```
320-
321-
Start without Docker and verify that `install.sh` rejects the Snap installation:
322-
323-
```shell
324-
nix run .#test-guest -- \
325-
--distro ubuntu-24-04 \
326-
--with snapd \
327-
--keep \
328-
--copy ./install.sh:/tmp/install.sh \
329-
--copy ./nix/test-guest/scripts/snap-gateway-repro.sh:/usr/local/bin/snap-gateway-repro \
330-
-- /usr/local/bin/snap-gateway-repro /tmp/install.sh missing-docker 10
331-
```
332-
333-
`--keep` retains the overlay and serial log when diagnosing a failure. The
334-
runner prints their location after shutdown.
335-
336-
337299
The destination must be an absolute guest path. Use bare octal permission bits
338300
from `000` through `777` for explicit modes.
339301

‎nix/test-guest/scripts/snap-gateway-repro.sh‎

Lines changed: 0 additions & 176 deletions
This file was deleted.

‎tasks/scripts/test-packaging-assets.sh‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,13 @@ snapcraft="${ROOT}/snapcraft.yaml"
119119
snap_workflow="${ROOT}/.github/workflows/snap-package.yml"
120120
snap_install_docs="${ROOT}/docs/about/installation.mdx"
121121
snap_canary="${ROOT}/.github/workflows/release-canary.yml"
122-
snap_repro="${ROOT}/nix/test-guest/scripts/snap-gateway-repro.sh"
123122
snap_post_refresh_hook="${ROOT}/snap/hooks/post-refresh"
124123
package_deb="${ROOT}/tasks/scripts/package-deb.sh"
125124
assert_file_exists "$snap_wrapper"
126125
assert_file_exists "$snapcraft"
127126
assert_file_exists "$snap_workflow"
128127
assert_file_exists "$snap_install_docs"
129128
assert_file_exists "$snap_canary"
130-
assert_file_exists "$snap_repro"
131129
assert_file_exists "$snap_post_refresh_hook"
132130
assert_file_exists "$package_deb"
133131
assert_contains "$service" "ExecStartPre=/usr/bin/openshell-gateway config preflight"
@@ -149,7 +147,6 @@ for snap_file in \
149147
"$snapcraft" \
150148
"$snap_install_docs" \
151149
"$snap_canary" \
152-
"$snap_repro" \
153150
"$snap_post_refresh_hook"; do
154151
assert_not_contains "$snap_file" "docker:docker-daemon"
155152
assert_not_contains "$snap_file" "default-provider: docker"
@@ -199,15 +196,8 @@ assert_contains "$snap_canary" "install.sh | sh"
199196
assert_contains "$snap_canary" "ubuntu-snap-system-docker:"
200197
assert_contains "$snap_canary" "ubuntu-snap-docker-preflight:"
201198
assert_contains "$snap_canary" "openshell.prover check"
202-
assert_contains "$snap_repro" 'OPENSHELL_INSTALL_METHOD=snap OPENSHELL_VERSION=dev sh "${install_script}"'
203-
assert_contains "$snap_repro" "/snap/bin/openshell.prover check"
204-
assert_contains "$snap_repro" "system-docker"
205-
assert_contains "$snap_repro" "missing-docker"
206-
assert_contains "$snap_repro" "docker-snap"
207199
assert_not_contains "$snap_canary" "--dangerous"
208-
assert_not_contains "$snap_repro" "--dangerous"
209200
assert_not_contains "$snap_canary" "snap connect openshell:docker"
210-
assert_not_contains "$snap_repro" "snap connect openshell:docker"
211201
if ! awk '/config preflight/ { seen = 1 } /generate-certs/ { exit !seen }' "$service"; then
212202
echo "FAIL: Debian preflight must precede certificate generation" >&2
213203
exit 1

0 commit comments

Comments
 (0)