This is an automated email from the ASF dual-hosted git repository.
zirui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 0c6b06979a [INLONG-9394][Sort] Incorrect use of maven plugin on
integration test among sort-end-to-end-tests (#9403)
0c6b06979a is described below
commit 0c6b06979a0354bc470614ad7ceffea440828c98
Author: Hao <1780095+hnrai...@users.noreply.github.com>
AuthorDate: Tue Dec 5 10:48:00 2023 +0800
[INLONG-9394][Sort] Incorrect use of maven plugin on integration test among
sort-end-to-end-tests (#9403)
---
.github/workflows/ci_ut.yml | 2 +-
.github/workflows/ci_ut_flink15.yml | 2 +-
.../sort-end-to-end-tests/sort-end-to-end-tests-v1.13/pom.xml | 3 +++
.../sort/tests/{ClickHouseCase.java => ClickHouseITCase.java} | 6 +++---
.../sort/tests/{KafkaE2ECase.java => KafkaE2EITCase.java} | 10 +++++-----
.../src/test/resources/log4j2-test.properties | 2 +-
.../sort-end-to-end-tests/sort-end-to-end-tests-v1.15/pom.xml | 3 +++
...ngodbToStarRocksTest.java => MongodbToStarRocksITCase.java} | 6 +++---
.../tests/{MysqlToRocksTest.java => MysqlToRocksITCase.java} | 6 +++---
...gresToStarRocksTest.java => PostgresToStarRocksITCase.java} | 6 +++---
...verToStarRocksTest.java => SqlserverToStarRocksITCase.java} | 6 +++---
11 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/ci_ut.yml
index 180a8e2876..636dd2d9b3 100644
--- a/.github/workflows/ci_ut.yml
+++ b/.github/workflows/ci_ut.yml
@@ -101,7 +101,7 @@ jobs:
CI: false
- name: Unit test with Maven
- run: mvn --batch-mode --update-snapshots -e -V test
+ run: mvn --batch-mode --update-snapshots -e -V verify
env:
CI: false
diff --git a/.github/workflows/ci_ut_flink15.yml
b/.github/workflows/ci_ut_flink15.yml
index 343af7dc39..77d604e38a 100644
--- a/.github/workflows/ci_ut_flink15.yml
+++ b/.github/workflows/ci_ut_flink15.yml
@@ -60,7 +60,7 @@ jobs:
CI: false
- name: Unit test for Flink 1.15 with Maven
- run: mvn --update-snapshots -e -V test -pl
:sort-core,:sort-end-to-end-tests-v1.15 -am -Pv1.15
+ run: mvn --update-snapshots -e -V verify -pl
:sort-core,:sort-end-to-end-tests-v1.15 -am -Pv1.15
env:
CI: false
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/pom.xml
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/pom.xml
index 6a4b400bc5..f8968f194b 100644
--- a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/pom.xml
+++ b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/pom.xml
@@ -193,6 +193,9 @@
<executions>
<execution>
<id>end-to-end-tests-v1.13</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
<phase>integration-test</phase>
<configuration>
<includes>
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/ClickHouseCase.java
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/ClickHouseITCase.java
similarity index 96%
rename from
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/ClickHouseCase.java
rename to
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/ClickHouseITCase.java
index 0c1b5335e9..0d5e151af3 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/ClickHouseCase.java
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/ClickHouseITCase.java
@@ -45,9 +45,9 @@ import java.util.List;
* End-to-end tests
* Test flink sql mysql cdc to clickHouse
*/
-public class ClickHouseCase extends FlinkContainerTestEnv {
+public class ClickHouseITCase extends FlinkContainerTestEnv {
- private static final Logger LOG =
LoggerFactory.getLogger(ClickHouseCase.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(ClickHouseITCase.class);
private static final Path jdbcJar =
TestUtils.getResource("sort-connector-jdbc.jar");
private static final Path mysqlJar =
TestUtils.getResource("sort-connector-mysql-cdc.jar");
@@ -57,7 +57,7 @@ public class ClickHouseCase extends FlinkContainerTestEnv {
static {
try {
- sqlFile =
Paths.get(ClickHouseCase.class.getResource("/flinkSql/clickhouse_test.sql").toURI()).toString();
+ sqlFile =
Paths.get(ClickHouseITCase.class.getResource("/flinkSql/clickhouse_test.sql").toURI()).toString();
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/KafkaE2ECase.java
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/KafkaE2EITCase.java
similarity index 96%
rename from
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/KafkaE2ECase.java
rename to
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/KafkaE2EITCase.java
index e3989435f7..10406f6d3a 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/KafkaE2ECase.java
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/KafkaE2EITCase.java
@@ -51,9 +51,9 @@ import java.util.Map;
/**
* End-to-end tests for sort-connector-kafka uber jar.
*/
-public class KafkaE2ECase extends FlinkContainerTestEnv {
+public class KafkaE2EITCase extends FlinkContainerTestEnv {
- private static final Logger LOG =
LoggerFactory.getLogger(KafkaE2ECase.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(KafkaE2EITCase.class);
private static final Path kafkaJar =
TestUtils.getResource("sort-connector-kafka.jar");
private static final Path jdbcJar =
TestUtils.getResource("sort-connector-jdbc.jar");
@@ -78,7 +78,7 @@ public class KafkaE2ECase extends FlinkContainerTestEnv {
private Path getSql(String fileName, Map<String, Object> properties) {
try {
- Path file = Paths.get(KafkaE2ECase.class.getResource("/flinkSql/"
+ fileName).toURI());
+ Path file =
Paths.get(KafkaE2EITCase.class.getResource("/flinkSql/" + fileName).toURI());
return PlaceholderResolver.getDefaultResolver().resolveByMap(file,
properties);
} catch (URISyntaxException e) {
throw new RuntimeException(e);
@@ -87,7 +87,7 @@ public class KafkaE2ECase extends FlinkContainerTestEnv {
private Path getGroupFile(String fileName, Map<String, Object> properties)
{
try {
- Path file = Paths.get(KafkaE2ECase.class.getResource("/groupFile/"
+ fileName).toURI());
+ Path file =
Paths.get(KafkaE2EITCase.class.getResource("/groupFile/" + fileName).toURI());
return PlaceholderResolver.getDefaultResolver().resolveByMap(file,
properties);
} catch (URISyntaxException e) {
throw new RuntimeException(e);
@@ -96,7 +96,7 @@ public class KafkaE2ECase extends FlinkContainerTestEnv {
private String getCreateStatement(String fileName, Map<String, Object>
properties) {
try {
- Path file = Paths.get(KafkaE2ECase.class.getResource("/env/" +
fileName).toURI());
+ Path file = Paths.get(KafkaE2EITCase.class.getResource("/env/" +
fileName).toURI());
return PlaceholderResolver.getDefaultResolver().resolveByMap(
new String(Files.readAllBytes(file),
StandardCharsets.UTF_8),
properties);
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/log4j2-test.properties
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/log4j2-test.properties
index 9f14c92cb8..cfafff07e7 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/log4j2-test.properties
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/log4j2-test.properties
@@ -61,6 +61,6 @@
logger.mysql.name=org.apache.inlong.sort.tests.utils.MySqlContainer
logger.mysql.additivity=false
logger.kafka=INFO, kafkaserver
-logger.kafka.name=org.apache.inlong.sort.tests.KafkaE2ECase
+logger.kafka.name=org.apache.inlong.sort.tests.KafkaE2EITCase
logger.kafka.additivity=false
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/pom.xml
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/pom.xml
index 150a3d2ab7..aea273ec99 100644
--- a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/pom.xml
+++ b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/pom.xml
@@ -242,6 +242,9 @@
<executions>
<execution>
<id>end-to-end-tests-v1.15</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
<phase>integration-test</phase>
<configuration>
<includes>
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MongodbToStarRocksTest.java
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MongodbToStarRocksITCase.java
similarity index 97%
rename from
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MongodbToStarRocksTest.java
rename to
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MongodbToStarRocksITCase.java
index 673077308d..f07c5145fb 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MongodbToStarRocksTest.java
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MongodbToStarRocksITCase.java
@@ -60,9 +60,9 @@ import static com.mongodb.client.model.Updates.*;
* End-to-end tests for sort-connector-mongodb-cdc-v1.15 uber jar.
* Test flink sql Mongodb cdc to StarRocks
*/
-public class MongodbToStarRocksTest extends FlinkContainerTestEnv {
+public class MongodbToStarRocksITCase extends FlinkContainerTestEnv {
- private static final Logger LOG =
LoggerFactory.getLogger(MongodbToStarRocksTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(MongodbToStarRocksITCase.class);
private static final Path mongodbJar =
TestUtils.getResource("sort-connector-mongodb-cdc.jar");
private static final Path jdbcJar =
TestUtils.getResource("sort-connector-starrocks.jar");
@@ -82,7 +82,7 @@ public class MongodbToStarRocksTest extends
FlinkContainerTestEnv {
static {
try {
- sqlFile =
Paths.get(PostgresToStarRocksTest.class.getResource("/flinkSql/mongodb_test.sql").toURI())
+ sqlFile =
Paths.get(PostgresToStarRocksITCase.class.getResource("/flinkSql/mongodb_test.sql").toURI())
.toString();
buildStarRocksImage();
} catch (URISyntaxException e) {
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MysqlToRocksTest.java
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MysqlToRocksITCase.java
similarity index 96%
rename from
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MysqlToRocksTest.java
rename to
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MysqlToRocksITCase.java
index e0415e24f0..bbeccd04a5 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MysqlToRocksTest.java
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/MysqlToRocksITCase.java
@@ -52,9 +52,9 @@ import static
org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStar
* End-to-end tests for sort-connector-postgres-cdc-v1.15 uber jar.
* Test flink sql Mysql cdc to StarRocks
*/
-public class MysqlToRocksTest extends FlinkContainerTestEnv {
+public class MysqlToRocksITCase extends FlinkContainerTestEnv {
- private static final Logger LOG =
LoggerFactory.getLogger(MysqlToRocksTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(MysqlToRocksITCase.class);
private static final Path mysqlJar =
TestUtils.getResource("sort-connector-mysql-cdc.jar");
private static final Path jdbcJar =
TestUtils.getResource("sort-connector-starrocks.jar");
@@ -64,7 +64,7 @@ public class MysqlToRocksTest extends FlinkContainerTestEnv {
static {
try {
sqlFile =
-
Paths.get(MysqlToRocksTest.class.getResource("/flinkSql/mysql_test.sql").toURI()).toString();
+
Paths.get(MysqlToRocksITCase.class.getResource("/flinkSql/mysql_test.sql").toURI()).toString();
buildStarRocksImage();
} catch (URISyntaxException e) {
throw new RuntimeException(e);
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/PostgresToStarRocksTest.java
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/PostgresToStarRocksITCase.java
similarity index 96%
rename from
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/PostgresToStarRocksTest.java
rename to
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/PostgresToStarRocksITCase.java
index 5c7208a7f6..1acb0c9979 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/PostgresToStarRocksTest.java
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/PostgresToStarRocksITCase.java
@@ -52,9 +52,9 @@ import static
org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStar
* End-to-end tests for sort-connector-postgres-cdc-v1.15 uber jar.
* Test flink sql Postgres cdc to StarRocks
*/
-public class PostgresToStarRocksTest extends FlinkContainerTestEnv {
+public class PostgresToStarRocksITCase extends FlinkContainerTestEnv {
- private static final Logger LOG =
LoggerFactory.getLogger(PostgresToStarRocksTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(PostgresToStarRocksITCase.class);
private static final Path postgresJar =
TestUtils.getResource("sort-connector-postgres-cdc.jar");
private static final Path jdbcJar =
TestUtils.getResource("sort-connector-starrocks.jar");
@@ -63,7 +63,7 @@ public class PostgresToStarRocksTest extends
FlinkContainerTestEnv {
static {
try {
- sqlFile =
Paths.get(PostgresToStarRocksTest.class.getResource("/flinkSql/postgres_test.sql").toURI())
+ sqlFile =
Paths.get(PostgresToStarRocksITCase.class.getResource("/flinkSql/postgres_test.sql").toURI())
.toString();
buildStarRocksImage();
} catch (URISyntaxException e) {
diff --git
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/SqlserverToStarRocksTest.java
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/SqlserverToStarRocksITCase.java
similarity index 97%
rename from
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/SqlserverToStarRocksTest.java
rename to
inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/SqlserverToStarRocksITCase.java
index 194fb2cfd5..b44f17d018 100644
---
a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/SqlserverToStarRocksTest.java
+++
b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/SqlserverToStarRocksITCase.java
@@ -49,9 +49,9 @@ import static
org.apache.inlong.sort.tests.utils.StarRocksManager.buildStarRocks
import static
org.apache.inlong.sort.tests.utils.StarRocksManager.getNewStarRocksImageName;
import static
org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStarRocksTable;
-public class SqlserverToStarRocksTest extends FlinkContainerTestEnv {
+public class SqlserverToStarRocksITCase extends FlinkContainerTestEnv {
- private static final Logger LOG =
LoggerFactory.getLogger(SqlserverToStarRocksTest.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(SqlserverToStarRocksITCase.class);
private static final Path sqlserverJar =
TestUtils.getResource("sort-connector-sqlserver-cdc.jar");
private static final Path jdbcJar =
TestUtils.getResource("sort-connector-starrocks.jar");
@@ -62,7 +62,7 @@ public class SqlserverToStarRocksTest extends
FlinkContainerTestEnv {
static {
try {
- sqlFile =
Paths.get(SqlserverToStarRocksTest.class.getResource("/flinkSql/sqlserver_test.sql").toURI())
+ sqlFile =
Paths.get(SqlserverToStarRocksITCase.class.getResource("/flinkSql/sqlserver_test.sql").toURI())
.toString();
buildStarRocksImage();
} catch (URISyntaxException e) {
