diff --git a/.gitlab/build-and-test-fast.yml b/.gitlab/build-and-test-fast.yml index e47843df..13885f09 100644 --- a/.gitlab/build-and-test-fast.yml +++ b/.gitlab/build-and-test-fast.yml @@ -212,4 +212,4 @@ coverage: max: 2 when: script_failure script: - - make coverage + - DD_API_KEY=$(vault kv get -field key kv/k8s/gitlab-runner/nginx-datadog/datadoghq-api-key 2>/dev/null) make coverage diff --git a/Makefile b/Makefile index f6a4ad15..1a4bc587 100644 --- a/Makefile +++ b/Makefile @@ -304,3 +304,4 @@ endif tar -C .musl-build -xzf test/coverage_data.tar.gz cd .musl-build; llvm-profdata merge -sparse *.profraw -o default.profdata && llvm-cov export ./ngx_http_datadog_module.so -format=lcov -instr-profile=default.profdata -ignore-filename-regex=src/coverage_fixup\.c > coverage.lcov codecov -Z -f .musl-build/coverage.lcov --disable-search -t $$(vault kv get -field=token kv/k8s/gitlab-runner/nginx-datadog/codecov) + npx --yes @datadog/datadog-ci@latest coverage upload --format=lcov .musl-build/coverage.lcov || true diff --git a/build_env/Dockerfile b/build_env/Dockerfile index 53d0b190..89767c4d 100644 --- a/build_env/Dockerfile +++ b/build_env/Dockerfile @@ -85,6 +85,9 @@ RUN cargo install --locked cbindgen --version 0.26.0 && \ # Shellcheck RUN apk add --no-cache shellcheck +# Node.js (for datadog-ci coverage upload) +RUN apk add --no-cache nodejs npm + # UV and Python packages for tests COPY --from=uv /uv /usr/local/bin/uv COPY pyproject.toml .