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/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 2b92827d5 [hotfix] Add flink1.17 e2e test ci check (#804)
2b92827d5 is described below
commit 2b92827d58d2f2aff6174847fd2f6f0a207d1d26
Author: Kerwin <[email protected]>
AuthorDate: Mon Apr 3 10:31:57 2023 +0800
[hotfix] Add flink1.17 e2e test ci check (#804)
---
.github/workflows/e2e-tests-1.16.yml | 4 ++--
...{e2e-tests-1.16.yml => e2e-tests-1.17-jdk11.yml} | 21 +++++++++++----------
.../{e2e-tests-1.16.yml => e2e-tests-1.17.yml} | 6 +++---
paimon-e2e-tests/pom.xml | 18 +++++++++++++-----
.../org/apache/paimon/hive/Hive23CatalogITCase.java | 8 +++-----
.../org/apache/paimon/hive/Hive31CatalogITCase.java | 8 +++-----
pom.xml | 4 ++--
7 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/e2e-tests-1.16.yml
b/.github/workflows/e2e-tests-1.16.yml
index 9a9cf4435..39af919e1 100644
--- a/.github/workflows/e2e-tests-1.16.yml
+++ b/.github/workflows/e2e-tests-1.16.yml
@@ -41,7 +41,7 @@ jobs:
java-version: ${{ env.JDK_VERSION }}
distribution: 'adopt'
- name: Build Flink 1.16
- run: ./mvnw clean install -DskipTests
+ run: ./mvnw clean install -DskipTests -Pflink-1.16
- name: Test Flink 1.16
timeout-minutes: 60
run: |
@@ -49,4 +49,4 @@ jobs:
. .github/workflows/utils.sh
jvm_timezone=$(random_timezone)
echo "JVM timezone is set to $jvm_timezone"
- ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone
+ ./mvnw test -pl paimon-e2e-tests -Duser.timezone=$jvm_timezone
-Pflink-1.16
diff --git a/.github/workflows/e2e-tests-1.16.yml
b/.github/workflows/e2e-tests-1.17-jdk11.yml
similarity index 82%
copy from .github/workflows/e2e-tests-1.16.yml
copy to .github/workflows/e2e-tests-1.17-jdk11.yml
index 9a9cf4435..1590b0926 100644
--- a/.github/workflows/e2e-tests-1.16.yml
+++ b/.github/workflows/e2e-tests-1.17-jdk11.yml
@@ -16,20 +16,22 @@
# limitations under the License.
################################################################################
-name: End to End Tests Flink 1.16
+name: End to End Tests Flink 1.17 on JDK 11
on:
- push:
- pull_request:
- paths-ignore:
- - 'docs/**'
- - '**/*.md'
+ issue_comment:
+ types: [created, edited, deleted]
+
+ # daily run
+ schedule:
+ - cron: "0 0 * * *"
env:
- JDK_VERSION: 8
+ JDK_VERSION: 11
jobs:
build:
+ if: contains(github.event.comment.html_url, '/pull/') &&
contains(github.event.comment.body, '/jdk11')
runs-on: ubuntu-latest
steps:
@@ -40,10 +42,9 @@ jobs:
with:
java-version: ${{ env.JDK_VERSION }}
distribution: 'adopt'
- - name: Build Flink 1.16
+ - name: Build Flink 1.17
run: ./mvnw clean install -DskipTests
- - name: Test Flink 1.16
- timeout-minutes: 60
+ - name: Test Flink 1.17
run: |
# run tests with random timezone to find out timezone related bugs
. .github/workflows/utils.sh
diff --git a/.github/workflows/e2e-tests-1.16.yml
b/.github/workflows/e2e-tests-1.17.yml
similarity index 94%
copy from .github/workflows/e2e-tests-1.16.yml
copy to .github/workflows/e2e-tests-1.17.yml
index 9a9cf4435..bf93e7c4e 100644
--- a/.github/workflows/e2e-tests-1.16.yml
+++ b/.github/workflows/e2e-tests-1.17.yml
@@ -16,7 +16,7 @@
# limitations under the License.
################################################################################
-name: End to End Tests Flink 1.16
+name: End to End Tests Flink 1.17
on:
push:
@@ -40,9 +40,9 @@ jobs:
with:
java-version: ${{ env.JDK_VERSION }}
distribution: 'adopt'
- - name: Build Flink 1.16
+ - name: Build Flink 1.17
run: ./mvnw clean install -DskipTests
- - name: Test Flink 1.16
+ - name: Test Flink 1.17
timeout-minutes: 60
run: |
# run tests with random timezone to find out timezone related bugs
diff --git a/paimon-e2e-tests/pom.xml b/paimon-e2e-tests/pom.xml
index 5ae584b49..943f3da05 100644
--- a/paimon-e2e-tests/pom.xml
+++ b/paimon-e2e-tests/pom.xml
@@ -175,12 +175,10 @@ under the License.
<profiles>
<!-- Activate these profiles with -Pflink-x.xx to build and test
against different Flink versions -->
<profile>
- <id>flink-1.14</id>
+ <id>flink-1.16</id>
<properties>
- <test.flink.main.version>1.14</test.flink.main.version>
- <test.flink.version>1.14.6</test.flink.version>
-
<flink.sql.connector.kafka>flink-sql-connector-kafka_${scala.binary.version}</flink.sql.connector.kafka>
-
<flink.sql.connector.hive>flink-sql-connector-hive-2.3.6_${scala.binary.version}</flink.sql.connector.hive>
+ <test.flink.main.version>1.16</test.flink.main.version>
+ <test.flink.version>1.16.1</test.flink.version>
</properties>
</profile>
@@ -193,5 +191,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>flink-1.14</id>
+ <properties>
+ <test.flink.main.version>1.14</test.flink.main.version>
+ <test.flink.version>1.14.6</test.flink.version>
+
<flink.sql.connector.kafka>flink-sql-connector-kafka_${scala.binary.version}</flink.sql.connector.kafka>
+
<flink.sql.connector.hive>flink-sql-connector-hive-2.3.6_${scala.binary.version}</flink.sql.connector.hive>
+ </properties>
+ </profile>
</profiles>
</project>
diff --git
a/paimon-hive/paimon-hive-connector-2.3/src/test/java/org/apache/paimon/hive/Hive23CatalogITCase.java
b/paimon-hive/paimon-hive-connector-2.3/src/test/java/org/apache/paimon/hive/Hive23CatalogITCase.java
index 8c143617b..2df418e37 100644
---
a/paimon-hive/paimon-hive-connector-2.3/src/test/java/org/apache/paimon/hive/Hive23CatalogITCase.java
+++
b/paimon-hive/paimon-hive-connector-2.3/src/test/java/org/apache/paimon/hive/Hive23CatalogITCase.java
@@ -138,11 +138,9 @@ public class Hive23CatalogITCase extends
HiveCatalogITCaseBase {
assertThatThrownBy(() -> tEnv.executeSql("ALTER TABLE
alter_failed_table SET ('aa'='bb')"))
.isInstanceOf(TableException.class)
.hasMessage(
- String.format(
- "Could not execute "
- + "ALTER TABLE
my_alter_hive.default.alter_failed_table "
- + "SET (aa: [bb], path:
[%sdefault.db/alter_failed_table])",
- path));
+ "Could not execute "
+ + "ALTER TABLE
my_alter_hive.default.alter_failed_table\n"
+ + " SET 'aa' = 'bb'");
assertTrue(
new SchemaManager(
diff --git
a/paimon-hive/paimon-hive-connector-3.1/src/test/java/org/apache/paimon/hive/Hive31CatalogITCase.java
b/paimon-hive/paimon-hive-connector-3.1/src/test/java/org/apache/paimon/hive/Hive31CatalogITCase.java
index 7c6b3f068..26d24c74b 100644
---
a/paimon-hive/paimon-hive-connector-3.1/src/test/java/org/apache/paimon/hive/Hive31CatalogITCase.java
+++
b/paimon-hive/paimon-hive-connector-3.1/src/test/java/org/apache/paimon/hive/Hive31CatalogITCase.java
@@ -138,11 +138,9 @@ public class Hive31CatalogITCase extends
HiveCatalogITCaseBase {
assertThatThrownBy(() -> tEnv.executeSql("ALTER TABLE
alter_failed_table SET ('aa'='bb')"))
.isInstanceOf(TableException.class)
.hasMessage(
- String.format(
- "Could not execute "
- + "ALTER TABLE
my_alter_hive.default.alter_failed_table "
- + "SET (aa: [bb], path:
[%sdefault.db/alter_failed_table])",
- path));
+ "Could not execute "
+ + "ALTER TABLE
my_alter_hive.default.alter_failed_table\n"
+ + " SET 'aa' = 'bb'");
assertTrue(
new SchemaManager(
diff --git a/pom.xml b/pom.xml
index b18f895ca..7f6f4ddf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,8 @@ under the License.
<!-- Can be set to any value to reproduce a specific build. -->
<test.randomization.seed/>
<test.unit.pattern>**/*Test.*</test.unit.pattern>
- <test.flink.main.version>1.16</test.flink.main.version>
- <test.flink.version>1.16.1</test.flink.version>
+ <test.flink.main.version>1.17</test.flink.main.version>
+ <test.flink.version>1.17.0</test.flink.version>
<janino.version>3.0.11</janino.version>
<mockito.version>3.4.6</mockito.version>
