From 43316a3d42eaf31cb93e897c565e16489da4286a Mon Sep 17 00:00:00 2001
From: Naoto Ono <nono@cloudbees.com>
Date: Tue, 16 Sep 2025 17:34:36 +0900
Subject: [PATCH 1/2] Enable the early flake detection on CI

---
 .github/workflows/python-package.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index f9357aead..a9d38dafc 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -99,7 +99,7 @@ jobs:
         # Tell Launchable about the build you are producing and testing
         launchable record build --name ${GITHUB_RUN_ID}
 
-        launchable record session --build ${GITHUB_RUN_ID} --flavor os=${{ matrix.os }} --flavor python=${{ matrix.python-version }} > session.txt
+        launchable record session --build ${GITHUB_RUN_ID} --test-suite 'python-unittest' --flavor os=${{ matrix.os }} --flavor python=${{ matrix.python-version }} > session.txt
 
         # Find 25% of the relevant tests to run for this change
         find tests -name test_*.py | grep -v tests/data | launchable subset --target 25% --session $(cat session.txt) --rest launchable-remainder.txt file > subset.txt
@@ -117,3 +117,26 @@ jobs:
         # Test rest of tests
         pipenv run test-xml $(tr '\r\n' '\n' < launchable-remainder.txt)
       shell: bash
+
+    - name: Flake detection
+      run: |
+        # Early flake detection
+        while true; do
+          launchable detect-flakes --session "$(cat session.txt)" file > flake.txt
+          if [[ ! -s flake.txt ]]; then
+            echo "No tests to retry. Done."
+            break
+          fi
+          rc=0
+          # Run tests; if they fail, save the status but keep going
+          pipenv run test-xml $(tr '\r\n' '\n' < flake.txt) || rc=$?
+
+          launchable record tests --session "$(cat session.txt)" file test-results/*.xml
+
+          # If tests failed, exit with that code
+          if (( rc != 0 )); then
+            exit $rc
+          fi
+        done
+      shell: bash
+      if : always()

From f51defca67acbe4e7484ecaa6f1a532a95ddab69 Mon Sep 17 00:00:00 2001
From: Naoto Ono <nono@cloudbees.com>
Date: Wed, 17 Sep 2025 11:48:10 +0900
Subject: [PATCH 2/2] Add a new test

---
 tests/test_flaky.py | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 tests/test_flaky.py

diff --git a/tests/test_flaky.py b/tests/test_flaky.py
new file mode 100644
index 000000000..764fe9947
--- /dev/null
+++ b/tests/test_flaky.py
@@ -0,0 +1,8 @@
+import random
+from unittest import TestCase
+
+
+class TestFlaky(TestCase):
+    def test_flaky_function(self):
+        # Flaky by design: passes 95% of the time, fails 5%
+        self.assertGreater(random.random(), 0.05)