Enhancements from Kafka Mirrormaker2 forlog truncation detection and topic reset handling.

.asf.yaml

@@ -15,10 +15,6 @@
 # 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]
@@ -29,22 +25,13 @@ notifications:
 # Read more here: https://github.com/apache/infrastructure-asfyaml
 github:
   collaborators:
-    - m1a2st
-    - smjn
-    - TaiJuWu
+    - FrankYang0529
+    - kirktrue
     - brandboat
-    - Yunyung
-    - xijiu
-    - chirag-wadhwa5
-    - mingyen066
-    - ShivsundarR
-    - Rancho-7
-  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: ~
+    - AndrewJSchofield
+    - OmniaGM
+    - nizhikov
+    - dongnuo123
+    - gaurav-narula
+    - apourchet
+    - apoorvmittal10

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

@@ -22,10 +22,7 @@ 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 Gradle task name to run."
-    required: true
-  test-xml-output:
-    description: "Output directory for JUnit XML results"
+    description: "The test suite to run. Either 'test' or 'quarantinedTest'."
     required: true
   timeout-minutes:
     description: "The timeout for the tests, in minutes."
@@ -36,32 +33,10 @@ 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:
@@ -77,31 +52,16 @@ 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 }}
-      # This build step is invoked by build.yml to run junit tests only,
-      # Spotbugs is being run by that workflow via the "check" task and does not need to also be run here,
-      # since that is redundant.
       run: |
         set +e
         ./.github/scripts/thread-dump.sh &
         timeout ${TIMEOUT_MINUTES}m ./gradlew --build-cache --continue --no-scan \
         -PtestLoggingEvents=started,passed,skipped,failed \
-        -PmaxParallelForks=4 \
-        -PmaxTestRetries=$TEST_RETRIES -PmaxTestRetryFailures=10 \
+        -PmaxParallelForks=2 \
+        -PmaxTestRetries=1 -PmaxTestRetryFailures=3 \
+        -PmaxQuarantineTestRetries=3 -PmaxQuarantineTestRetryFailures=0 \
         -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 \
-        -x spotbugsMain \
-        -x spotbugsTest \
         $TEST_TASK
         exitcode="$?"
         echo "exitcode=$exitcode" >> $GITHUB_OUTPUT
@@ -112,4 +72,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

@@ -37,12 +37,12 @@ runs:
   using: "composite"
   steps:
     - name: Setup Java
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v4
       with:
         distribution: temurin
         java-version: ${{ inputs.java-version }}
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
+      uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
       env:
         GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
       with:

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

@@ -22,7 +22,7 @@ runs:
   using: "composite"
   steps:
     - name: Setup Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v5
       with:
         python-version: 3.12
     - name: Pip install

.github/configs/labeler.yml

@@ -92,12 +92,6 @@ transactions:
       - any-glob-to-any-file:
           - 'transaction-coordinator/**'
 
-group-coordinator:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'group-coordinator/**'
-          - 'coordinator-common/**'
-
 kip-932:
   - changed-files:
       - any-glob-to-any-file: