From 1cf7535c9068111d0f95cae1ed47e64c2cfc3001 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 6 Jan 2023 09:15:01 +0100
Subject: [PATCH] Add flaky retry/reporting to store model test (#16275)

---
 .github/actions/upload-flaky-tests/action.yml | 2 +-
 .github/workflows/ci.yml                      | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/actions/upload-flaky-tests/action.yml b/.github/actions/upload-flaky-tests/action.yml
index c34b9f5083..57c9f54919 100644
--- a/.github/actions/upload-flaky-tests/action.yml
+++ b/.github/actions/upload-flaky-tests/action.yml
@@ -16,7 +16,7 @@ runs:
       run: |
         FLAKES=""
         SEP=""
-        for dir in $(find -type d -name surefire-reports); do
+        for dir in $(find -type d -name 'surefire-reports*'); do
           for i in $(grep -l '<flakyFailure' $dir/TEST-*.xml); do
             FLAKES="$FLAKES$SEP$i"
             SEP=$'\n'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b94f2bfd6e..00d28a6c2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -318,12 +318,19 @@ jobs:
         uses: ./.github/actions/integration-test-setup
 
       - name: Run model tests
-        run: testsuite/model/test-all-profiles.sh
+        run: testsuite/model/test-all-profiles.sh -Dsurefire.rerunFailingTestsCount=${{ env.SUREFIRE_RERUN_FAILING_COUNT }}
 
       - name: Upload JVM Heapdumps
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
+      - uses: ./.github/actions/upload-flaky-tests
+        name: Upload flaky tests
+        env:
+          GH_TOKEN: ${{ github.token }}
+        with:
+          job-name: Store Model Tests
+
   clustering-integration-tests:
     name: Legacy Clustering IT
     needs: build