Upload results.json using raw api, rather than test-collector

pipelines/main/launch_signed_jobs.yml.signature

@@ -1 +1 @@
-Salted__~ xHE�H��$B0_	��(��������,#ag�(��9��xS��y.�vq��g�����:�Ek0�j�
L��#�_�$�c�="�+�1E
+Salted__،���;�lh�)L+�P��8����J�͟h�l[X��8O��zf�sފ�Q�ƛJu}�'�I��+f�Lh�BupPz=QH-{t��pm

pipelines/main/misc/upload_buildkite_results.yml

@@ -16,14 +16,38 @@ steps:
           - staticfloat/cryptic#v2:
               variables:
                 - BUILDKITE_ANALYTICS_TOKEN="U2FsdGVkX18BUSpNWNimRUOAh2ku0ugS7x3RRy1CfJBCxTLWArJpa1PXKoILfI7q"
-          - test-collector#v1.10.1:
-              files: "results*.json"
-              format: "json"
-              missing-error: 0
         timeout_in_minutes: ${TIMEOUT?}
         soft_fail: true
         commands: |
+          echo "--- Downloading test results from test step"
           buildkite-agent artifact download --step "test_${TRIPLET?}" "results*.json" . || true
+
+          echo "--- Uploading test results and assigning them to the test run"
+          export JOB_ID="$$(buildkite-agent meta-data get BUILDKITE_TEST_JOB_ID_test_${TRIPLET?} || echo "unknown")"
+
+          shopt -s nullglob  # Ensure empty glob does not return a literal string
+          for file in results*.json; do
+            echo "Uploading $$file..."
+            # We can't use the test-collector plugin because it doesn't provide a way to set a custom `job_id`
+            curl \
+              -X POST \
+              --silent \
+              --show-error \
+              --max-time "${TIMEOUT?}" \
+              -H "Authorization: Token token=\"$$BUILDKITE_ANALYTICS_TOKEN\"" \
+              -F "data=@\"$$file\"" \
+              -F "format=json" \
+              -F "run_env[CI]=buildkite" \
+              -F "run_env[key]=\"$$BUILDKITE_BUILD_ID\"" \
+              -F "run_env[url]=\"$$BUILDKITE_BUILD_URL\"" \
+              -F "run_env[branch]=\"$$BUILDKITE_BRANCH\"" \
+              -F "run_env[commit_sha]=\"$$BUILDKITE_COMMIT\"" \
+              -F "run_env[number]=\"$$BUILDKITE_BUILD_NUMBER\"" \
+              -F "run_env[job_id]=\"$$JOB_ID\"" \
+              -F "run_env[message]=\"$$(printf “%q” “$$BUILDKITE_MESSAGE”)\"" \
+              https://analytics-api.buildkite.com/v1/uploads
+            echo "\n"
+          done
         agents:
           queue: "julia"
         env:

pipelines/scheduled/coverage/coverage.yml.signature

@@ -1,2 +1 @@
-Salted___��x^�|gB�>��O$9���'����ZW�ҷ�fSiqy�VՌ���`rIW�
-��h���6�Yq.�5�����2����
+Salted__F5*�P3ߩ��oi'���4:�1�s�A:�U��=t���!�:_�`}��o����>K0�,d�Q��~d3)Q�^�xFK��

pipelines/scheduled/launch_upload_jobs.yml.signature

@@ -1 +1,2 @@
-Salted__���`��&Z��AkY�c�Æ"Y�O��H�M�M���Y��叱k �Gq��H��_L�I.'�8�$�Z�}X NA.
rh��xɈ
+Salted__��F�"����z5���!@6�C`s_2�b��I�ti�s�FN �ԂKڹn2��y���~��.�P�
+�f����C�dHwh9L�.�}�hE�

utilities/test_julia.sh

@@ -77,7 +77,7 @@ if [[ "${USE_RR-}" == "rr" ]] || [[ "${USE_RR-}" == "rr-net" ]]; then
 
     # Do not run Pkg tests on rr
     TESTS_TO_SKIP+=( Pkg )
-    
+
     # rr: all tests EXCEPT the network-related tests
     # rr-net: ONLY the network-related tests
     NETWORK_RELATED_TESTS=( Artifacts Downloads download LazyArtifacts LibGit2/online)
@@ -160,8 +160,11 @@ else
 fi
 
 echo "--- Upload results.json report"
+# store the test job id so that the upload job can assign the results to the right job id
+buildkite-agent meta-data set BUILDKITE_TEST_JOB_ID_${BUILDKITE_STEP_KEY} "${BUILDKITE_JOB_ID}"
+echo "meta-data BUILDKITE_TEST_JOB_ID_${BUILDKITE_STEP_KEY} has been set to \"$(buildkite-agent meta-data get BUILDKITE_TEST_JOB_ID_${BUILDKITE_STEP_KEY})\""
 if compgen -G "${JULIA_INSTALL_DIR}/share/julia/test/results*.json"; then
-    (cd "${JULIA_INSTALL_DIR}/share/julia/test"; buildkite-agent artifact upload results*.json)
+    (cd "${JULIA_INSTALL_DIR}/share/julia/test"; buildkite-agent artifact upload "results*.json")
 else
     echo "no JSON results files found"
 fi