RUST-1678 Switch junit merge tools (#1120)

Author: abr-egn

.evergreen/install-dependencies.sh

@@ -30,31 +30,13 @@ for arg; do
   elif [ $arg == "junit-dependencies" ]; then
     source ${CARGO_HOME}/env
 
-    # install npm/node
-    ./.evergreen/install-node.sh
-
     source ./.evergreen/env.sh
 
     # Install junit-compatible test runner
     cargo install cargo-nextest --locked
 
     # Install tool for merging different junit reports into a single one
-    set +o errexit
-    set -o pipefail
-
-    npm install -g junit-report-merger --cache $(mktemp -d) 2>&1 | tee npm-install-output
-    RESULT=$?
-    MATCH=$(grep -o '/\S*-debug.log' npm-install-output)
-    if [[ $MATCH != "" ]]; then
-      echo ===== BEGIN NPM LOG =====
-      cat $MATCH
-      echo ===== END NPM LOG =====
-    fi
-
-    set -o errexit
-    if [ $RESULT -ne 0 ]; then
-      exit $RESULT
-    fi
+    cargo install merge-junit
   elif [ $arg == "libmongocrypt" ]; then
     mkdir ${PROJECT_DIRECTORY}/libmongocrypt
     cd ${PROJECT_DIRECTORY}/libmongocrypt

.evergreen/install-node.sh

@@ -24,6 +24,6 @@ cargo_test spec::auth spec.xml
 cargo_test uri_options uri_options.xml
 cargo_test connection_string connection_string.xml
 
-junit-report-merger results.xml auth_aws.xml lambda_handler.xml spec.xml uri_options.xml connection_string.xml
+merge-junit -o results.xml auth_aws.xml lambda_handler.xml spec.xml uri_options.xml connection_string.xml
 
 exit $CARGO_RESULT

.evergreen/run-aws-tests.sh

@@ -15,6 +15,6 @@ cargo_test spec::auth spec.xml
 cargo_test uri_options uri_options.xml
 cargo_test connection_string connection_string.xml
 
-junit-report-merger results.xml spec.xml uri_options.xml connection_string.xml
+merge-junit -o results.xml spec.xml uri_options.xml connection_string.xml
 
 exit ${CARGO_RESULT}

.evergreen/run-connection-string-tests.sh

@@ -34,6 +34,6 @@ unset AWS_ACCESS_KEY_ID
 unset AWS_SECRET_ACCESS_KEY
 cargo_test test::csfle::on_demand_aws_failure failure.xml
 
-junit-report-merger results.xml prose.xml spec.xml failure.xml
+merge-junit -o results.xml prose.xml spec.xml failure.xml
 
 exit ${CARGO_RESULT}

.evergreen/run-csfle-kmip-servers.sh

@@ -21,6 +21,6 @@ cargo_test test::cursor cursor.xml
 cargo_test test::spec::collection_management coll.xml
 cargo_test test::spec::command_monitoring_unified monitoring.xml
 
-junit-report-merger results.xml crud.xml retryable_reads.xml retryable_writes.xml versioned_api.xml sessions.xml transactions.xml load_balancers.xml cursor.xml coll.xml monitoring.xml
+merge-junit -o results.xml crud.xml retryable_reads.xml retryable_writes.xml versioned_api.xml sessions.xml transactions.xml load_balancers.xml cursor.xml coll.xml monitoring.xml
 
 exit $CARGO_RESULT