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

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

.gitlab/generate-appsec.php

@@ -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"

.gitlab/generate-profiler.php

@@ -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

.gitlab/generate-shared.php

@@ -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"
@@ -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"
@@ -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"
@@ -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"

.gitlab/generate-tracer.php

@@ -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
 }
 

.gitlab/silent-upload-junit-to-datadog.sh

@@ -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