Skip to content

Reduce the output of the junit upload output on success #3593

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
bwoebi merged 1 commit into from
Jan 21, 2026
+15 −7
Merged

Reduce the output of the junit upload output on success #3593

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
2 changes: 1 addition & 1 deletion .gitlab/generate-appsec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,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/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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
after_script:
- |
if [ "${IMAGE_SUFFIX}" != "_centos-7" ]; then
.gitlab/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
8 changes: 4 additions & 4 deletions .gitlab/generate-shared.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
after_script:
- mkdir -p tmp/artifacts
- cp tmp/build_php_components_asan/Testing/Temporary/LastTest.log tmp/artifacts/LastTestASan.log
- .gitlab/upload-junit-to-datadog.sh "test.source.file:components-rs"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:components-rs"
artifacts:
reports:
junit: "artifacts/*-results.xml"
Expand All @@ -57,7 +57,7 @@
after_script:
- mkdir -p tmp/artifacts
- cp tmp/build_php_components_ubsan/Testing/Temporary/LastTest.log tmp/artifacts/LastTestUBSan.log
- .gitlab/upload-junit-to-datadog.sh "test.source.file:components-rs"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:components-rs"
artifacts:
reports:
junit: "artifacts/*-results.xml"
Expand Down Expand Up @@ -85,7 +85,7 @@
after_script:
- mkdir -p tmp/artifacts/
- cp tmp/build-tea-${SWITCH_PHP_VERSION}/Testing/Temporary/LastTest.log tmp/artifacts/LastTest.log
- .gitlab/upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
artifacts:
reports:
junit: "artifacts/*-results.xml"
Expand All @@ -107,7 +107,7 @@
after_script:
- mkdir -p tmp/artifacts
- cp tmp/build*/Testing/Temporary/LastTest.log tmp/artifacts/LastTest.log
- .gitlab/upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:zend_abstract_interface"
artifacts:
reports:
junit: "artifacts/*-results.xml"
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/generate-tracer.php
View file
Open in desktop
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/upload-junit-to-datadog.sh "test.source.file:src"
- .gitlab/silent-upload-junit-to-datadog.sh "test.source.file:src"
<?php
}

Expand Down
8 changes: 8 additions & 0 deletions .gitlab/silent-upload-junit-to-datadog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
OUTFILE=/tmp/datadog-junit-upload.txt
"$(dirname -- "${BASH_SOURCE[0]}")"/upload-junit-to-datadog.sh "$@" >$OUTFILE 2>&1
if [[ $? -ne 0 ]]; then
cat $OUTFILE
else
grep -E '^\* ' $OUTFILE
fi
Loading