This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 1283350525 [build] Support e2e tests on jdk11 (#5245)
1283350525 is described below
commit 1283350525efe3812d517d9443068fd58beb9f9e
Author: Yubin Li <[email protected]>
AuthorDate: Mon Mar 10 21:30:47 2025 +0800
[build] Support e2e tests on jdk11 (#5245)
---
.github/workflows/e2e-tests-flink-jdk11.yml | 6 +++---
.github/workflows/e2e-tests-flink.yml | 2 +-
paimon-e2e-tests/pom.xml | 11 +++++++++++
.../src/test/java/org/apache/paimon/tests/HiveE2eTest.java | 4 ++++
.../src/test/java/org/apache/paimon/tests/SparkE2eTest.java | 4 ++++
.../src/test/resources-filtered/docker-compose.yaml | 4 ++--
6 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/e2e-tests-flink-jdk11.yml
b/.github/workflows/e2e-tests-flink-jdk11.yml
index a8a0da02b4..6674ec4e4f 100644
--- a/.github/workflows/e2e-tests-flink-jdk11.yml
+++ b/.github/workflows/e2e-tests-flink-jdk11.yml
@@ -52,7 +52,7 @@ jobs:
distribution: 'temurin'
- name: Build Flink
- run: mvn -T 1C -B clean install -DskipTests -pl paimon-e2e-tests -am
+ run: mvn -T 1C -B clean install -DskipTests -pl paimon-e2e-tests -am
-Pflink-${{ matrix.flink_version }},java11
- name: Test Flink
run: |
@@ -62,9 +62,9 @@ jobs:
echo "JVM timezone is set to $jvm_timezone"
profile="flink-${{ matrix.flink_version }}"
if [ "${{ matrix.flink_version }}" = "${{ matrix.flink_version[-1]
}}" ]; then
- mvn -T 1C -B test -pl paimon-e2e-tests
-Duser.timezone=$jvm_timezone
+ mvn -T 1C -B test -pl paimon-e2e-tests
-Duser.timezone=$jvm_timezone -Pjava11
else
- mvn -T 1C -B test -pl paimon-e2e-tests
-Duser.timezone=$jvm_timezone -P${profile}
+ mvn -T 1C -B test -pl paimon-e2e-tests
-Duser.timezone=$jvm_timezone -P${profile},java11
fi
env:
MAVEN_OPTS: -Xmx4096m
\ No newline at end of file
diff --git a/.github/workflows/e2e-tests-flink.yml
b/.github/workflows/e2e-tests-flink.yml
index 0323b1aedd..4779efb6e1 100644
--- a/.github/workflows/e2e-tests-flink.yml
+++ b/.github/workflows/e2e-tests-flink.yml
@@ -52,7 +52,7 @@ jobs:
distribution: 'temurin'
- name: Build Flink
- run: mvn -T 2C -B clean install -DskipTests -pl paimon-e2e-tests -am
+ run: mvn -T 2C -B clean install -DskipTests -pl paimon-e2e-tests -am
-Pflink-${{ matrix.flink_version }}
- name: Test Flink
run: |
diff --git a/paimon-e2e-tests/pom.xml b/paimon-e2e-tests/pom.xml
index 1ba183588a..a965e42afb 100644
--- a/paimon-e2e-tests/pom.xml
+++ b/paimon-e2e-tests/pom.xml
@@ -32,6 +32,7 @@ under the License.
<name>Paimon : End to End Tests</name>
<properties>
+ <test.java.version>java8</test.java.version>
<flink.shaded.hadoop.version>2.8.3-10.0</flink.shaded.hadoop.version>
<flink.cdc.version>3.1.1</flink.cdc.version>
<flink.sql.connector.hive>flink-sql-connector-hive-2.3.10_${flink.scala.binary.version}</flink.sql.connector.hive>
@@ -342,5 +343,15 @@ under the License.
<flink.sql.connector.hive>flink-sql-connector-hive-2.3.6_${scala.binary.version}</flink.sql.connector.hive>
</properties>
</profile>
+
+ <profile>
+ <id>java11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+ <test.java.version>java11</test.java.version>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git
a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
index 9d3583daa2..ebcce0045b 100644
--- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
+++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
@@ -20,6 +20,7 @@ package org.apache.paimon.tests;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
@@ -29,12 +30,15 @@ import java.util.Arrays;
import java.util.List;
import java.util.UUID;
+import static org.junit.jupiter.api.condition.JRE.JAVA_11;
+
/**
* Tests for reading paimon from Hive.
*
* <p>NOTE: This test runs a complete Hadoop cluster in Docker, which requires
a lot of memory. If
* you're running this test locally, make sure that the memory limit of your
Docker is at least 8GB.
*/
+@DisabledOnJre(JAVA_11)
public class HiveE2eTest extends E2eReaderTestBase {
private static final Logger LOG =
LoggerFactory.getLogger(HiveE2eTest.class);
diff --git
a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/SparkE2eTest.java
b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/SparkE2eTest.java
index b826761c7a..1606d68967 100644
--- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/SparkE2eTest.java
+++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/SparkE2eTest.java
@@ -19,6 +19,7 @@
package org.apache.paimon.tests;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
@@ -28,7 +29,10 @@ import java.util.Arrays;
import java.util.UUID;
import java.util.stream.Collectors;
+import static org.junit.jupiter.api.condition.JRE.JAVA_11;
+
/** Tests for reading paimon from Spark3. */
+@DisabledOnJre(JAVA_11)
public class SparkE2eTest extends E2eReaderTestBase {
private static final Logger LOG =
LoggerFactory.getLogger(SparkE2eTest.class);
diff --git a/paimon-e2e-tests/src/test/resources-filtered/docker-compose.yaml
b/paimon-e2e-tests/src/test/resources-filtered/docker-compose.yaml
index e564ef21f3..3909b54b41 100644
--- a/paimon-e2e-tests/src/test/resources-filtered/docker-compose.yaml
+++ b/paimon-e2e-tests/src/test/resources-filtered/docker-compose.yaml
@@ -25,7 +25,7 @@ services:
# ----------------------------------------
jobmanager:
- image: apache/flink:${test.flink.version}-java8
+ image: apache/flink:${test.flink.version}-${test.java.version}
volumes:
- testdata:/test-data
- /tmp/paimon-e2e-tests-jars:/jars
@@ -49,7 +49,7 @@ services:
- "8081"
taskmanager:
- image: apache/flink:${test.flink.version}-java8
+ image: apache/flink:${test.flink.version}-${test.java.version}
volumes:
- testdata:/test-data
- /tmp/paimon-e2e-tests-jars:/jars
