[infinispan#16813] Linkify flaky test names and show occurrence count in PR comments

Author: tristantarrant

.github/actions/comment-pr-flaky-test/action.yml

@@ -22,14 +22,39 @@ runs:
         PR="${{ inputs.pr-number }}"
         if [ "$PR" != "" ]; then
           shopt -s nullglob globstar
+
+          # Load flaky-test-issues mapping (written by track_flaky_tests.sh)
+          declare -A ISSUE_MAP
+          declare -A COMMENT_COUNT_MAP
+          if [ -f flaky-test-issues.map ]; then
+            while IFS=$'\t' read -r key number count; do
+              ISSUE_MAP["$key"]="$number"
+              COMMENT_COUNT_MAP["$key"]="$count"
+            done < flaky-test-issues.map
+          fi
+
           FLAKY_TEST_GLOB="**/target/*-reports*/**/TEST-*FLAKY.xml"
           TESTS=(${FLAKY_TEST_GLOB})
           for TEST in "${TESTS[@]}"
           do
-            FULL_TEST_NAME=$(xmlstarlet sel -T -t -m "/testsuite/testcase" -o '   - '\
+            RAW_NAMES=$(xmlstarlet sel -T -t -m "/testsuite/testcase" \
              -v "concat(@classname,'#',@name)" -n ${TEST} \
              | sed 's/(Flaky Test)//' | sed 's/\[[0-9]\]//')
-            FLAKES_PR_COMMENT="$FLAKES_PR_COMMENT$FULL_TEST_NAME\n"
+            while IFS= read -r LINE; do
+              [ -z "$LINE" ] && continue
+              # Strip leading/trailing whitespace
+              LINE=$(echo "$LINE" | xargs)
+              # Build lookup key by stripping parameters (same logic as track_flaky_tests.sh)
+              LOOKUP_KEY="${LINE%%\[*}"
+              LOOKUP_KEY="${LOOKUP_KEY%%(*}"
+              if [ -n "${ISSUE_MAP[$LOOKUP_KEY]+x}" ]; then
+                ISSUE_NUM="${ISSUE_MAP[$LOOKUP_KEY]}"
+                SEEN_COUNT=$(( ${COMMENT_COUNT_MAP[$LOOKUP_KEY]} + 1 ))
+                FLAKES_PR_COMMENT="$FLAKES_PR_COMMENT   - [${LINE}](https://github.com/${{ github.repository }}/issues/${ISSUE_NUM}) (seen ${SEEN_COUNT} times)\n"
+              else
+                FLAKES_PR_COMMENT="$FLAKES_PR_COMMENT   - ${LINE}\n"
+              fi
+            done <<< "$RAW_NAMES"
           done
           if [ "$FLAKES_PR_COMMENT" != "" ]; then
             pr_url=https://github.com/${{ github.repository }}/pull/$PR

bin/gh/track_flaky_tests.sh

@@ -69,13 +69,18 @@ for TEST in "${TESTS[@]}"; do
       ISSUE_NUMBER=$(echo "${ISSUE_URL}" | grep -oE '[0-9]+$')
       # Set the issue type to Bug via API
       gh api -X PATCH "/repos/${GITHUB_REPOSITORY}/issues/${ISSUE_NUMBER}" --field type=Bug
+      COMMENT_COUNT=0
     else
-      export ISSUE_KEY=$(echo "${ISSUES}" | jq  '.[0].number')
+      ISSUE_NUMBER=$(echo "${ISSUES}" | jq -r '.[0].number')
+      # Fetch issue data to check state and get comment count in a single API call
+      ISSUE_DATA=$(gh api "repos/${GITHUB_REPOSITORY}/issues/${ISSUE_NUMBER}")
+      COMMENT_COUNT=$(echo "${ISSUE_DATA}" | jq .comments)
       # Re-open the issue if it was previously resolved
-      if [ "$(gh issue view ${ISSUE_KEY} --json state | jq .state)" == '"CLOSED"' ]; then
-        gh issue reopen ${ISSUE_KEY}
+      if [ "$(echo "${ISSUE_DATA}" | jq -r .state)" == 'closed' ]; then
+        gh issue reopen ${ISSUE_NUMBER}
       fi
-      gh issue comment ${ISSUE_KEY} --body "${BODY}"
+      gh issue comment ${ISSUE_NUMBER} --body "${BODY}"
     fi
+    echo -e "${TEST_CLASS}#${TEST_NAME_NO_PARAMS}\t${ISSUE_NUMBER}\t${COMMENT_COUNT}" >> flaky-test-issues.map
   done
 done