From 7b994d9d8897a9e0028771ec34a90d47d7776c43 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Mon, 16 Mar 2026 17:34:59 +0100 Subject: [PATCH 1/2] Fixup names for directory matching Signed-off-by: Bob Weinand --- .gitlab/generate-appsec.php | 2 +- .gitlab/generate-profiler.php | 2 +- .gitlab/generate-tracer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php index c948df3ba9c..1a5f4dbc709 100644 --- a/.gitlab/generate-appsec.php +++ b/.gitlab/generate-appsec.php @@ -345,7 +345,7 @@ - mkdir -p "${CI_PROJECT_DIR}/artifacts" - find appsec/tests/integration/build/test-results -name "*.xml" -exec cp --parents '{}' "${CI_PROJECT_DIR}/artifacts/" \; || true - cp -r appsec/tests/integration/build/test-logs "${CI_PROJECT_DIR}/artifacts/" 2>/dev/null || true - - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:appsec" + - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:appsec/" artifacts: reports: junit: "artifacts/**/test-results/**/TEST-*.xml" diff --git a/.gitlab/generate-profiler.php b/.gitlab/generate-profiler.php index 50e38e6761d..0ed90db7330 100644 --- a/.gitlab/generate-profiler.php +++ b/.gitlab/generate-profiler.php @@ -68,7 +68,7 @@ after_script: - | if [ "${IMAGE_SUFFIX}" != "_centos-7" ]; then - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:profiling" + .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:profiling/" else echo "Skipping JUnit upload on CentOS 7 (old glibc/OpenSSL incompatible with datadog-ci)" fi diff --git a/.gitlab/generate-tracer.php b/.gitlab/generate-tracer.php index acefb647380..c69bd108cfb 100644 --- a/.gitlab/generate-tracer.php +++ b/.gitlab/generate-tracer.php @@ -23,7 +23,7 @@ function after_script($execute_dir = ".", $has_test_agent = false) { - .gitlab/check_test_agent.sh - .gitlab/collect_artifacts.sh "" - - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src" + - .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src/" Date: Mon, 16 Mar 2026 18:19:33 +0100 Subject: [PATCH 2/2] Add xslt to alpine uploader Signed-off-by: Bob Weinand --- .gitlab/generate-appsec.php | 2 +- .gitlab/upload-junit-to-datadog.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php index 1a5f4dbc709..bf9b2de6344 100644 --- a/.gitlab/generate-appsec.php +++ b/.gitlab/generate-appsec.php @@ -125,7 +125,7 @@ after_script: - mkdir -p "${CI_PROJECT_DIR}/artifacts" - find appsec/tests/integration/build/test-results -name "*.xml" -exec cp --parents '{}' "${CI_PROJECT_DIR}/artifacts/" \; - - .gitlab/upload-junit-to-datadog.sh "test.source.file:appsec" + - .gitlab/upload-junit-to-datadog.sh "test.source.file:appsec/" artifacts: reports: junit: "artifacts/**/test-results/**/TEST-*.xml" diff --git a/.gitlab/upload-junit-to-datadog.sh b/.gitlab/upload-junit-to-datadog.sh index 9bc785eeeae..a7ce07fd827 100755 --- a/.gitlab/upload-junit-to-datadog.sh +++ b/.gitlab/upload-junit-to-datadog.sh @@ -41,7 +41,7 @@ if command -v apk &> /dev/null; then # Alpine Linux is_alpine=true echo "Using apk package manager..." - apk add --no-cache curl jq nodejs npm unzip || { + apk add --no-cache curl jq libxslt nodejs npm unzip || { echo "Warning: Failed to install dependencies. Skipping JUnit upload." >&2 exit 0 }