fix(quic-interop): runner renamed implementations.json → implementations_quic.json
Upstream quic-interop-runner split its config into implementations_quic.json + implementations_webtransport.json so QUIC and WebTransport endpoint registrations don't collide. Schema is unchanged; just the filename. Also updated the Makefile comment + plan doc for consistency. https://claude.ai/code/session_01HcvfQq1ttPV9PkRoJb4nyT
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# make build # compile JVM dist + build Docker image
|
# make build # compile JVM dist + build Docker image
|
||||||
# make smoke # quick handshake test against a local picoquic
|
# make smoke # quick handshake test against a local picoquic
|
||||||
# make image-name # print the image tag (for use in implementations.json)
|
# make image-name # print the image tag (for use in implementations_quic.json)
|
||||||
#
|
#
|
||||||
# These targets are deliberately thin wrappers — the real harness is the
|
# These targets are deliberately thin wrappers — the real harness is the
|
||||||
# `quic-interop-runner` repo (clone separately and register `amethyst` with
|
# `quic-interop-runner` repo (clone separately and register `amethyst` with
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ reorder / migration scenarios that are awkward to reproduce in unit tests.
|
|||||||
## Local iteration loop
|
## Local iteration loop
|
||||||
|
|
||||||
The fast path: `quic/interop/run-matrix.sh` clones the runner alongside
|
The fast path: `quic/interop/run-matrix.sh` clones the runner alongside
|
||||||
this repo, sets up a venv, merges our `implementations.json` snippet,
|
this repo, sets up a venv, merges our `implementations_quic.json` snippet,
|
||||||
builds the endpoint image, and invokes `run.py`. All steps are
|
builds the endpoint image, and invokes `run.py`. All steps are
|
||||||
idempotent so repeated invocations just iterate.
|
idempotent so repeated invocations just iterate.
|
||||||
|
|
||||||
@@ -49,9 +49,9 @@ Manual flow (if `run-matrix.sh` doesn't fit):
|
|||||||
```
|
```
|
||||||
make -C quic/interop build
|
make -C quic/interop build
|
||||||
# Then in a sibling clone of quic-interop-runner, merge our snippet:
|
# Then in a sibling clone of quic-interop-runner, merge our snippet:
|
||||||
jq -s '.[0] * .[1]' implementations.json \
|
jq -s '.[0] * .[1]' implementations_quic.json \
|
||||||
../amethyst/quic/interop/quic-interop-runner-snippet.json \
|
../amethyst/quic/interop/quic-interop-runner-snippet.json \
|
||||||
> implementations.json.new && mv implementations.json.new implementations.json
|
> implementations_quic.json.new && mv implementations_quic.json.new implementations_quic.json
|
||||||
python run.py -d -i amethyst -s aioquic -t handshake,chacha20 --log-dir ./logs
|
python run.py -d -i amethyst -s aioquic -t handshake,chacha20 --log-dir ./logs
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# Drive the quic-interop-runner against the :quic-interop endpoint image.
|
# Drive the quic-interop-runner against the :quic-interop endpoint image.
|
||||||
#
|
#
|
||||||
# Idempotent: clones the runner alongside this repo if missing, sets up its
|
# Idempotent: clones the runner alongside this repo if missing, sets up its
|
||||||
# venv, registers `amethyst` in implementations.json, builds our endpoint
|
# venv, registers `amethyst` in implementations_quic.json, builds our endpoint
|
||||||
# image, then invokes run.py with the user's args.
|
# image, then invokes run.py with the user's args.
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
@@ -73,15 +73,15 @@ if [ ! -d "$RUNNER_DIR/.venv" ]; then
|
|||||||
fi
|
fi
|
||||||
"$RUNNER_DIR/.venv/bin/pip" install -q -r "$RUNNER_DIR/requirements.txt"
|
"$RUNNER_DIR/.venv/bin/pip" install -q -r "$RUNNER_DIR/requirements.txt"
|
||||||
|
|
||||||
# 3. Register our endpoint in implementations.json (idempotent).
|
# 3. Register our endpoint in implementations_quic.json (idempotent).
|
||||||
if ! jq -e '.amethyst' "$RUNNER_DIR/implementations.json" >/dev/null 2>&1; then
|
if ! jq -e '.amethyst' "$RUNNER_DIR/implementations_quic.json" >/dev/null 2>&1; then
|
||||||
echo "==> registering 'amethyst' in implementations.json"
|
echo "==> registering 'amethyst' in implementations_quic.json"
|
||||||
tmp=$(mktemp)
|
tmp=$(mktemp)
|
||||||
jq -s '.[0] * .[1]' \
|
jq -s '.[0] * .[1]' \
|
||||||
"$RUNNER_DIR/implementations.json" \
|
"$RUNNER_DIR/implementations_quic.json" \
|
||||||
"$SCRIPT_DIR/quic-interop-runner-snippet.json" \
|
"$SCRIPT_DIR/quic-interop-runner-snippet.json" \
|
||||||
> "$tmp"
|
> "$tmp"
|
||||||
mv "$tmp" "$RUNNER_DIR/implementations.json"
|
mv "$tmp" "$RUNNER_DIR/implementations_quic.json"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 4. Build the endpoint image (skippable for tight loops).
|
# 4. Build the endpoint image (skippable for tight loops).
|
||||||
|
|||||||
Reference in New Issue
Block a user