You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluss.apache.org by ab...@apache.org on 2026/10/14 12:48:26 UTC
(fluss) branch main updated (4c553b786e -> c3cebc8dd3)
This is an automated email from the ASF dual-hosted git repository.
fresh-borzoni pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/fluss.git
from 4c553b786e [docs] Clarify RustFS key login in Flink quickstart (#4631)
new c108f34181 [build] Move Spark Scala 2.13 tests to nightly
new c3cebc8dd3 [build] Fix Java 8 nightly failures for flink2 and spark3-lake
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci-template.yaml | 13 ++++++++-----
.github/workflows/nightly.yaml | 4 +++-
.../apache/fluss/spark/lake/SparkLakeIcebergTest.java | 17 +++++++++--------
.../fluss/spark/lake/SparkLakeLogTableReadTest.scala | 1 +
fluss-test-coverage/pom.xml | 3 +++
pom.xml | 3 +++
6 files changed, 27 insertions(+), 14 deletions(-)
copy fluss-common/src/main/java/org/apache/fluss/annotation/docs/ConfigOverrideDefault.java => fluss-spark/fluss-spark-ut/src/test/java/org/apache/fluss/spark/lake/SparkLakeIcebergTest.java (78%)
(fluss) 01/02: [build] Move Spark Scala 2.13 tests to nightly
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fresh-borzoni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluss.git
commit c108f3418149e69b1cbcbc25940b4609a2ade064
Author: litiliu <38...@users.noreply.github.com>
AuthorDate: Wed Aug 12 11:23:10 2026 +0800
[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 3b98e20432..a7413f3cc4 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 4836e10f5a..ad4763ffdb 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
(fluss) 02/02: [build] Fix Java 8 nightly failures for flink2 and spark3-lake
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fresh-borzoni pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluss.git
commit c3cebc8dd3e315e2465645be58c757fed46b6c62
Author: Giannis Polyzos <ip...@gmail.com>
AuthorDate: Tue Oct 13 10:48:28 2026 +0300
[build] Fix Java 8 nightly failures for flink2 and spark3-lake
---
.../fluss/spark/lake/SparkLakeIcebergTest.java | 34 ++++++++++++++++++++++
.../spark/lake/SparkLakeLogTableReadTest.scala | 1 +
fluss-test-coverage/pom.xml | 3 ++
pom.xml | 3 ++
4 files changed, 41 insertions(+)
diff --git a/fluss-spark/fluss-spark-ut/src/test/java/org/apache/fluss/spark/lake/SparkLakeIcebergTest.java b/fluss-spark/fluss-spark-ut/src/test/java/org/apache/fluss/spark/lake/SparkLakeIcebergTest.java
new file mode 100644
index 0000000000..4908bf74bd
--- /dev/null
+++ b/fluss-spark/fluss-spark-ut/src/test/java/org/apache/fluss/spark/lake/SparkLakeIcebergTest.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.fluss.spark.lake;
+
+import org.scalatest.TagAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Identifies Spark test suites that require the Iceberg lake storage plugin, which is not built on
+ * Java 8.
+ */
+@TagAnnotation
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface SparkLakeIcebergTest {}
diff --git a/fluss-spark/fluss-spark-ut/src/test/scala/org/apache/fluss/spark/lake/SparkLakeLogTableReadTest.scala b/fluss-spark/fluss-spark-ut/src/test/scala/org/apache/fluss/spark/lake/SparkLakeLogTableReadTest.scala
index a3cc752a9c..03e9fe8d9e 100644
--- a/fluss-spark/fluss-spark-ut/src/test/scala/org/apache/fluss/spark/lake/SparkLakeLogTableReadTest.scala
+++ b/fluss-spark/fluss-spark-ut/src/test/scala/org/apache/fluss/spark/lake/SparkLakeLogTableReadTest.scala
@@ -780,6 +780,7 @@ class SparkLakePaimonLogTableReadTest extends SparkLakeLogTableReadTest {
}
@SparkLakeTest
+@SparkLakeIcebergTest
class SparkLakeIcebergLogTableReadTest extends SparkLakeLogTableReadTest {
override protected def dataLakeFormat: DataLakeFormat = DataLakeFormat.ICEBERG
diff --git a/fluss-test-coverage/pom.xml b/fluss-test-coverage/pom.xml
index 1fa5cadc86..561d34d4bd 100644
--- a/fluss-test-coverage/pom.xml
+++ b/fluss-test-coverage/pom.xml
@@ -376,6 +376,9 @@
<goal>check</goal>
</goals>
<configuration>
+ <!-- Modules that require Java 11 skip their tests on Java 8, so the
+ coverage gate is only meaningful (and enforced) on Java 11+ builds. -->
+ <skip>${skip.on.java8}</skip>
<dataFile>${project.basedir}/target/jacoco-aggregate.exec</dataFile>
<rules>
<rule>
diff --git a/pom.xml b/pom.xml
index 27f1006853..678acd2a02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,6 +454,9 @@
<properties>
<target.java.version>1.8</target.java.version>
<skip.on.java8>true</skip.on.java8>
+ <!-- Iceberg is not built on Java 8 (see fluss-lake-iceberg), so skip the Spark
+ suites that need it. Overridden when CI passes -DtagsToExclude explicitly. -->
+ <tagsToExclude>org.apache.fluss.spark.lake.SparkLakeIcebergTest</tagsToExclude>
</properties>
<build>
<plugins>