Skip to content

Improved stability of acvp tests #1399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Slach merged 1 commit into from
May 28, 2026
+10 −5
Merged

Improved stability of acvp tests #1399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkg/acvpwrapper/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,13 @@ docker run --rm \
-v "$PWD:/work" \
-w /work \
golang:1.26-alpine \
sh -lc 'export PATH=$PATH:/usr/local/go/bin && CGO_ENABLED=0 go build -o clickhouse-backup ./cmd/clickhouse-backup && ln -sf clickhouse-backup clickhouse-backup-acvp'
sh -lc 'export PATH=$PATH:/usr/local/go/bin && mkdir -p /work/.acvp && CGO_ENABLED=0 go build -o /work/.acvp/clickhouse-backup-acvp ./cmd/clickhouse-backup'
```

Note: the wrapper binary is built under `/work/.acvp/` to avoid collisions with
repository-local paths named `clickhouse-backup`, while preserving the required
basename `clickhouse-backup-acvp` that enables ACVP wrapper mode.

### 2) Fetch pinned upstream inputs

```bash
Expand Down Expand Up @@ -121,7 +125,7 @@ docker run --rm \
-v /tmp/acvp-testdata:/tmp/acvp-testdata:rw \
-w /tmp/acvp-testdata \
golang:1.26-alpine \
sh -lc 'export PATH=$PATH:/usr/local/go/bin && go run /tmp/boringssl/util/fipstools/acvp/acvptool/test/check_expected.go -tool /tmp/boringssl/acvptool-pinned -module-wrappers go:/work/clickhouse-backup-acvp -tests /work/pkg/acvpwrapper/acvp_test_fips140v1.26.public.config.json'
sh -lc 'export PATH=$PATH:/usr/local/go/bin && go run /tmp/boringssl/util/fipstools/acvp/acvptool/test/check_expected.go -tool /tmp/boringssl/acvptool-pinned -module-wrappers go:/work/.acvp/clickhouse-backup-acvp -tests /work/pkg/acvpwrapper/acvp_test_fips140v1.26.public.config.json'
```

Expected output includes:
Expand Down
7 changes: 4 additions & 3 deletions pkg/acvpwrapper/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ ACVP_TESTDATA_DIR="${ACVP_TESTDATA_DIR:-/tmp/acvp-testdata}"
BORINGSSL_COMMIT="${BORINGSSL_COMMIT:-baaf868e6e8f}"
ACVP_TESTDATA_COMMIT="${ACVP_TESTDATA_COMMIT:-d893de8b8b1c}"
CONFIG_PATH="${CONFIG_PATH:-/work/pkg/acvpwrapper/acvp_test_fips140v1.26.public.config.json}"
WRAPPER_BIN_PATH="${WRAPPER_BIN_PATH:-/work/.acvp/clickhouse-backup-acvp}"

echo "[1/4] Build clickhouse-backup and ACVP symlink"
echo "[1/4] Build ACVP wrapper binary"
docker run --rm \
-v "${REPO_ROOT}:/work" \
-w /work \
"${GO_IMAGE}" \
sh -lc 'export PATH=$PATH:/usr/local/go/bin && CGO_ENABLED=0 go build -o clickhouse-backup ./cmd/clickhouse-backup && ln -sf clickhouse-backup clickhouse-backup-acvp'
sh -lc "export PATH=\$PATH:/usr/local/go/bin && mkdir -p \"$(dirname "${WRAPPER_BIN_PATH}")\" && CGO_ENABLED=0 go build -o ${WRAPPER_BIN_PATH} ./cmd/clickhouse-backup"

echo "[2/4] Fetch pinned boringssl and acvp-testdata"
if [[ ! -d "${BORINGSSL_DIR}/.git" ]]; then
Expand Down Expand Up @@ -49,4 +50,4 @@ docker run --rm \
-v "${ACVP_TESTDATA_DIR}:/tmp/acvp-testdata:rw" \
-w /tmp/acvp-testdata \
"${GO_IMAGE}" \
sh -lc "export PATH=\$PATH:/usr/local/go/bin && go run /tmp/boringssl/util/fipstools/acvp/acvptool/test/check_expected.go -tool /tmp/boringssl/acvptool-pinned -module-wrappers go:/work/clickhouse-backup-acvp -tests ${CONFIG_PATH}"
sh -lc "export PATH=\$PATH:/usr/local/go/bin && go run /tmp/boringssl/util/fipstools/acvp/acvptool/test/check_expected.go -tool /tmp/boringssl/acvptool-pinned -module-wrappers go:${WRAPPER_BIN_PATH} -tests ${CONFIG_PATH}"