Use collect results

Author: cbeauchesne

.gitlab/collect_results.sh

@@ -77,6 +77,13 @@ do
   sed -i '/<testcase/ s/@[0-9a-f]\{5,\}/@HASHCODE/g' "$TARGET_DIR/$AGGREGATED_FILE_NAME"
   # Replace random port numbers by marker in testcase XML nodes to get stable test names
   sed -i '/<testcase/ s/localhost:[0-9]\{2,5\}/localhost:PORT/g' "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+  
+  # Add dd_tags[test.final_status] property to each testcase
+  xsl_file="$(dirname "$0")/add_final_status.xsl"
+  tmp_file="$(mktemp)"
+  xsltproc --output "$tmp_file" "$xsl_file" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+  mv "$tmp_file" "$TARGET_DIR/$AGGREGATED_FILE_NAME"
+
   if cmp -s "$RESULT_XML_FILE" "$TARGET_DIR/$AGGREGATED_FILE_NAME"; then
     echo ""
   else

.gitlab/upload_ciapp.sh

@@ -75,20 +75,6 @@ coverage_upload() {
         datadog-ci coverage upload --ignored-paths=./test-published-dependencies .
 }
 
-add_final_status_tags() {
-    echo "Add dd_tags[test.final_status] property to each testcase before upload"
-    local xsl_file
-    xsl_file="$(dirname "$0")/add_final_status.xsl"
-    find ./results -name '*.xml' | while read -r xml_file; do
-        local tmp_file
-        tmp_file="$(mktemp)"
-        xsltproc --output "$tmp_file" "$xsl_file" "$xml_file"
-        mv "$tmp_file" "$xml_file"
-    done
-}
-
-add_final_status_tags
-
 # Upload test results to production environment like all other CI jobs
 junit_upload "$DATADOG_API_KEY_PROD"
 junit_upload_status=$?