Skip to content

Commit ee9a8df

Browse files
bric3bric3
authored
fix: dedupe retried test count uploads (#11580)
fix: dedupe retried test count uploads Co-authored-by: brice.dutheil <brice.dutheil@datadoghq.com>
1 parent 9c106a8 commit ee9a8df

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,9 @@ muzzle-dep-report:
689689
- .gitlab/count_tests.sh "$GRADLE_TARGET" "$testJvm" "./results" "./test_counts_${CI_JOB_ID}.json"
690690
- export TEST_COUNTS_S3_PREFIX="test-counts/${CI_PIPELINE_ID}"
691691
- export TEST_COUNTS_FILE="./test_counts_${CI_JOB_ID}.json"
692-
- export TEST_COUNTS_S3_URI="s3://${TEST_COUNTS_S3_BUCKET}/${TEST_COUNTS_S3_PREFIX}/test_counts_${CI_JOB_ID}.json"
692+
# Use logical job identity in S3 so retried jobs overwrite stale attempts.
693+
- export TEST_COUNTS_S3_FILE="test_counts_${CI_JOB_NAME_SLUG}_${CI_NODE_INDEX}-${CI_NODE_TOTAL}.json"
694+
- export TEST_COUNTS_S3_URI="s3://${TEST_COUNTS_S3_BUCKET}/${TEST_COUNTS_S3_PREFIX}/${TEST_COUNTS_S3_FILE}"
693695
- echo "Uploading ${TEST_COUNTS_FILE} to ${TEST_COUNTS_S3_URI}"
694696
- aws s3 cp "$TEST_COUNTS_FILE" "$TEST_COUNTS_S3_URI" --only-show-errors
695697
- URL_ENCODED_JOB_NAME=$(jq -rn --arg x "$CI_JOB_NAME" '$x|@uri')

0 commit comments

Comments
 (0)