Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .gitlab/generate-appsec.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/generate-profiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/generate-tracer.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function after_script($execute_dir = ".", $has_test_agent = false) {
- .gitlab/check_test_agent.sh
<?php endif; ?>
- .gitlab/collect_artifacts.sh "<?= $execute_dir ?>"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src/"
<?php
}

Expand Down
2 changes: 1 addition & 1 deletion .gitlab/upload-junit-to-datadog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading