[java] Using retries due to GitHub actions env (#10280)

diemol · web-flow · commit f296ca9a2839 · 2022-01-24T11:15:24.000-05:00
diff --git a/.github/actions/bazel-test/action.yml b/.github/actions/bazel-test/action.yml
@@ -1,11 +1,14 @@
 name: 'Run bazel query and pass found targets to bazel test'
 inputs:
-  query:  # id of input
+  query: # id of input
     required: true
+  attempts:
+    required: false
+    default: 1
 runs:
   using: "composite"
   steps:
     - run: |
         cp .github/.bazelrc.local .
-        bazel query "${{ inputs.query }}" | xargs bazel test
+        bazel query "${{ inputs.query }}" | xargs bazel test --flaky_test_attempts=${{ inputs.attempts }}
       shell: bash
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -135,6 +135,7 @@ jobs:
         uses: ./.github/actions/bazel-test
         with:
           query: attr(tags, ${{ matrix.browser }}, tests(//java/...)) except attr(tags, 'lint|rc|remote', tests(//java/...))
+          attempts: 3
         env:
           DISPLAY: :99
 
@@ -175,6 +176,7 @@ jobs:
         uses: ./.github/actions/bazel-test
         with:
           query: attr(tags, ${{ matrix.browser }}, tests(//java/...)) intersect attr(tags, 'remote', tests(//java/...))
+          attempts: 3
         env:
           DISPLAY: :99
 
@@ -205,11 +207,10 @@ jobs:
       - name: Start XVFB
         run: Xvfb :99 &
       - name: Run browser tests in Firefox
-        uses: nick-invision/retry@v2
+        uses: ./.github/actions/bazel-test
         with:
-          timeout_minutes: 20
-          max_attempts: 3
-          command: bazel query "attr(tags, rc, tests(//java/...))" | xargs bazel test
+          query: attr(tags, rc, tests(//java/...))
+          attempts: 3
         env:
           DISPLAY: :99
 
