Merge branch 'trunk' into fix-issue-10789

Author: leaf-soba

.asf.yaml

@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Enable the next-gen .asf.yaml parser
+meta:
+  nextgen: true
+
 notifications:
   commits: [email protected]
   issues: [email protected]
@@ -25,13 +29,22 @@ notifications:
 # Read more here: https://github.com/apache/infrastructure-asfyaml
 github:
   collaborators:
-    - FrankYang0529
-    - kirktrue
     - brandboat
-    - AndrewJSchofield
-    - OmniaGM
-    - nizhikov
-    - dongnuo123
-    - gaurav-narula
-    - apourchet
-    - apoorvmittal10
+    - FrankYang0529
+    - gongxuanzhang
+    - m1a2st
+    - mingyen066
+    - ShivsundarR
+    - smjn
+    - TaiJuWu
+    - xijiu
+    - Yunyung
+  enabled_merge_buttons:
+    squash: true
+    squash_commit_message: PR_TITLE_AND_DESC
+    merge: false
+    rebase: false
+
+  # Disable legacy branch protections. We have manual rulesets which protect trunk
+  # and our release branches. See INFRA-26603
+  protected_branches: ~

.github/actions/run-gradle/action.yml

@@ -22,7 +22,10 @@ inputs:
   # Composite actions do not support typed parameters. Everything is treated as a string
   # See: https://github.com/actions/runner/issues/2238
   test-task:
-    description: "The test suite to run. Either 'test' or 'quarantinedTest'."
+    description: "The Gradle task name to run."
+    required: true
+  test-xml-output:
+    description: "Output directory for JUnit XML results"
     required: true
   timeout-minutes:
     description: "The timeout for the tests, in minutes."
@@ -33,10 +36,32 @@ inputs:
   build-scan-artifact-name:
     description: "The name to use for archiving the build scan."
     required: true
+  test-retries:
+    description: "The number of retries for a given test should we allow"
+    required: true
+    default: "0"
+  test-repeat:
+    description: "The number of times to repeat the integration tests"
+    required: true
+    default: "1"
+  test-verbose:
+    description: "Enable additional logging by the JUnit infrastructure"
+    required: true
+    default: "false"
+  run-new-tests:
+    description: "Run tests not present in the given test catalog"
+    required: true
+    default: "false"
+  run-flaky-tests:
+    description: "Run tests marked as flaky"
+    required: true
+    default: "false"
+
 outputs:
   gradle-exitcode:
     description: "The result of the Gradle test task."
     value: ${{ steps.run-tests.outputs.exitcode }}
+
 runs:
   using: "composite"
   steps:
@@ -52,15 +77,25 @@ runs:
         TIMEOUT_MINUTES: ${{ inputs.timeout-minutes}}
         TEST_CATALOG: ${{ inputs.test-catalog-path }}
         TEST_TASK: ${{ inputs.test-task }}
+        TEST_RETRIES: ${{ inputs.test-retries }}
+        TEST_REPEAT: ${{ inputs.test-repeat }}
+        RUN_NEW_TESTS: ${{ inputs.run-new-tests }}
+        RUN_FLAKY_TESTS: ${{ inputs.run-flaky-tests }}
+        TEST_XML_OUTPUT_DIR: ${{ inputs.test-xml-output }}
+        TEST_VERBOSE: ${{ inputs.test-verbose }}
       run: |
         set +e
         ./.github/scripts/thread-dump.sh &
         timeout ${TIMEOUT_MINUTES}m ./gradlew --build-cache --continue --no-scan \
         -PtestLoggingEvents=started,passed,skipped,failed \
-        -PmaxParallelForks=2 \
-        -PmaxTestRetries=1 -PmaxTestRetryFailures=3 \
-        -PmaxQuarantineTestRetries=3 -PmaxQuarantineTestRetryFailures=0 \
+        -PmaxParallelForks=4 \
+        -PmaxTestRetries=$TEST_RETRIES -PmaxTestRetryFailures=10 \
         -Pkafka.test.catalog.file=$TEST_CATALOG \
+        -Pkafka.test.run.new=$RUN_NEW_TESTS \
+        -Pkafka.test.run.flaky=$RUN_FLAKY_TESTS \
+        -Pkafka.test.xml.output.dir=$TEST_XML_OUTPUT_DIR \
+        -Pkafka.cluster.test.repeat=$TEST_REPEAT \
+        -Pkafka.test.verbose=$TEST_VERBOSE \
         -PcommitId=xxxxxxxxxxxxxxxx \
         $TEST_TASK
         exitcode="$?"
@@ -72,4 +107,4 @@ runs:
         name: ${{ inputs.build-scan-artifact-name }}
         path: ~/.gradle/build-scan-data
         compression-level: 9
-        if-no-files-found: ignore
+        if-no-files-found: ignore

.github/actions/setup-gradle/action.yml

@@ -42,7 +42,7 @@ runs:
         distribution: temurin
         java-version: ${{ inputs.java-version }}
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
+      uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
       env:
         GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
       with:

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+Delete this text and replace it with a detailed description of your change. The 
+PR title and body will become the squashed commit message.
+
+If you would like to tag individuals, add some commentary, upload images, or
+include other supplemental information that should not be part of the eventual
+commit message, please use a separate comment.
+
+If applicable, please include a summary of the testing strategy (including 
+rationale) for the proposed change. Unit and/or integration tests are expected
+for any behavior change and system tests should be considered for larger
+changes.