From 86cdfcb5b868efe60b1f70f397577cc013b64a44 Mon Sep 17 00:00:00 2001
From: litiliu <38579068+litiliu@users.noreply.github.com>
Date: Wed, 12 Aug 2026 11:23:10 +0800
Subject: [PATCH] [build] Move Spark Scala 2.13 tests to nightly

---
 .github/workflows/ci-template.yaml | 13 ++++++++-----
 .github/workflows/nightly.yaml     |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-template.yaml b/.github/workflows/ci-template.yaml
index 3b98e204329..a7413f3cc48 100644
--- a/.github/workflows/ci-template.yaml
+++ b/.github/workflows/ci-template.yaml
@@ -30,6 +30,11 @@ on:
         required: false
         type: string
         default: ""
+      run-spark-scala213:
+        description: "Whether to run the Spark tests with Scala 2.13."
+        required: false
+        type: boolean
+        default: false
 jobs:
   build:
     runs-on: self-hosted
@@ -37,6 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         module: [ core, flink1, flink2, spark3, spark3-lake, spark3-scala213, lake ]
+        exclude: ${{ fromJSON(inputs.run-spark-scala213 && '[]' || '[{"module":"spark3-scala213"}]') }}
         include:
           - module: flink1
             test-profile: "test-flink1"
@@ -44,9 +50,6 @@ jobs:
             test-profile: "test-flink2"
           - module: spark3-lake
             test-profile: "test-spark3"
-          - module: spark3-scala213
-            scala-profile: "-Pscala-2.13"
-            test-profile: "test-spark3"
     name: "${{ matrix.module }}"
     steps:
       - name: Checkout code
@@ -58,14 +61,14 @@ jobs:
           distribution: 'temurin'
       - name: Build
         run: |
-          mvn -T 1C -B clean install -DskipTests ${{ matrix.scala-profile }} ${{ inputs.maven-parameters }}
+          mvn -T 1C -B clean install -DskipTests ${{ matrix.module == 'spark3-scala213' && '-Pscala-2.13' || '' }} ${{ inputs.maven-parameters }}
       - name: Test
         timeout-minutes: 60
         run: |
           TEST_MODULES=$(./.github/workflows/stage.sh ${{ matrix.module }})
           echo "github ref: ${{ github.ref }}"
           echo "Start testing modules: $TEST_MODULES"
-          mvn -B verify $TEST_MODULES -Ptest-coverage -P${{ matrix.test-profile || format('test-{0}', matrix.module) }} ${{ matrix.scala-profile }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties ${{ inputs.maven-parameters }}
+          mvn -B verify $TEST_MODULES -Ptest-coverage -P${{ matrix.module == 'spark3-scala213' && 'test-spark3' || matrix.test-profile || format('test-{0}', matrix.module) }} -Dlog.dir=${{ runner.temp }}/fluss-logs -Dlog4j.configurationFile=${{ github.workspace }}/tools/ci/log4j.properties ${{ inputs.maven-parameters }}
         env:
           MAVEN_OPTS: -Xmx4096m
           ARTIFACTS_OSS_ENDPOINT: ${{ secrets.ARTIFACTS_OSS_ENDPOINT }}
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 4836e10f5aa..ad4763ffdb2 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -20,6 +20,7 @@ on:
   schedule:
     # Run at 20:00 UTC daily which is the lowest traffic time for Fluss project.
     - cron: "0 20 * * *"
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.number || github.run_id }}
@@ -31,4 +32,5 @@ jobs:
     uses: ./.github/workflows/ci-template.yaml
     with:
       java-version: "8"
-      maven-parameters: "-Pjava8"
\ No newline at end of file
+      maven-parameters: "-Pjava8"
+      run-spark-scala213: true