Skip to content

Commit 251e2dc

Browse files
committed
[INLONG-9866][Sort] Workflow test, no need merge.
1 parent 299ac28 commit 251e2dc

File tree

7 files changed

+10
-39
lines changed

7 files changed

+10
-39
lines changed

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/Kafka2StarRocksTesta.java

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ public class Kafka2StarRocksTesta extends FlinkContainerTestEnv {
100100
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
101101
.withExposedPorts(9030, 8030, 8040)
102102
.withNetwork(NETWORK)
103-
.withAccessToHost(true)
104103
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
105104
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
106105

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/Mongodb2StarRocksTesta.java

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public static void buildStarRocksImage() {
115115
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
116116
.withExposedPorts(9030, 8030, 8040)
117117
.withNetwork(NETWORK)
118-
.withAccessToHost(true)
119118
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
120119
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
121120

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/Mysql2StarRocksTesta.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ public class Mysql2StarRocksTesta extends FlinkContainerTestEnv {
7070
}
7171

7272
@ClassRule
73-
public static StarRocksContainer STAR_ROCKS =
73+
public static final StarRocksContainer STAR_ROCKS =
7474
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
7575
.withExposedPorts(9030, 8030, 8040)
7676
.withNetwork(NETWORK)
77-
.withAccessToHost(true)
7877
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
7978
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
8079

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/Postgres2StarRocksTest.java

+9-15
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,15 @@
4343
import java.util.Arrays;
4444
import java.util.List;
4545

46-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.INTER_CONTAINER_STAR_ROCKS_ALIAS;
47-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.STAR_ROCKS_LOG;
48-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.getNewStarRocksImageName;
49-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStarRocksTable;
46+
import static org.apache.inlong.sort.tests.utils.StarRocksManager.*;
47+
5048
/**
5149
* End-to-end tests for sort-connector-postgres-cdc-v1.15 uber jar.
5250
* Test flink sql Postgres cdc to StarRocks
5351
*/
5452
public class Postgres2StarRocksTest extends FlinkContainerTestEnv {
5553

5654
private static final Logger LOG = LoggerFactory.getLogger(Postgres2StarRocksTest.class);
57-
5855
private static final Path postgresJar = TestUtils.getResource("sort-connector-postgres-cdc.jar");
5956
private static final Path jdbcJar = TestUtils.getResource("sort-connector-starrocks.jar");
6057
private static final Path mysqlJdbcJar = TestUtils.getResource("mysql-driver.jar");
@@ -68,16 +65,6 @@ public class Postgres2StarRocksTest extends FlinkContainerTestEnv {
6865
throw new RuntimeException(e);
6966
}
7067
}
71-
72-
@ClassRule
73-
public static StarRocksContainer STAR_ROCKS =
74-
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
75-
.withExposedPorts(9030, 8030, 8040)
76-
.withNetwork(NETWORK)
77-
.withAccessToHost(true)
78-
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
79-
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
80-
8168
@ClassRule
8269
public static final PostgreSQLContainer POSTGRES_CONTAINER = (PostgreSQLContainer) new PostgreSQLContainer(
8370
DockerImageName.parse("debezium/postgres:13").asCompatibleSubstituteFor("postgres"))
@@ -87,6 +74,13 @@ public class Postgres2StarRocksTest extends FlinkContainerTestEnv {
8774
.withNetwork(NETWORK)
8875
.withNetworkAliases("postgres")
8976
.withLogConsumer(new Slf4jLogConsumer(LOG));
77+
@ClassRule
78+
public static final StarRocksContainer STAR_ROCKS =
79+
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
80+
.withExposedPorts(9030, 8030, 8040)
81+
.withNetwork(NETWORK)
82+
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
83+
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
9084

9185
@Before
9286
public void setup() {

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/RedisToRedisTest.java

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.inlong.sort.tests.utils.FlinkContainerTestEnv;
2121
import org.apache.inlong.sort.tests.utils.RedisContainer;
22-
import org.apache.inlong.sort.tests.utils.StarRocksContainer;
2322
import org.apache.inlong.sort.tests.utils.TestUtils;
2423

2524
import org.junit.AfterClass;
@@ -38,8 +37,6 @@
3837
import java.time.Duration;
3938
import java.util.concurrent.TimeUnit;
4039

41-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.*;
42-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.STAR_ROCKS_LOG;
4340
import static org.junit.Assert.assertEquals;
4441
import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
4542

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/Sqlserver2StarRocksTesta.java

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public class Sqlserver2StarRocksTesta extends FlinkContainerTestEnv {
7373
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
7474
.withExposedPorts(9030, 8030, 8040)
7575
.withNetwork(NETWORK)
76-
.withAccessToHost(true)
7776
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
7877
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
7978

inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/StarRocksManager.java

-16
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,6 @@ public class StarRocksManager {
5656
.withTag(NEW_STARROCKS_TAG).exec();
5757
oldStarRocks.stop();
5858
}
59-
public static void buildStarRocksImage() {
60-
GenericContainer oldStarRocks = new GenericContainer(STAR_ROCKS_IMAGE_NAME);
61-
Startables.deepStart(Stream.of(oldStarRocks)).join();
62-
oldStarRocks.copyFileToContainer(MountableFile.forClasspathResource("/docker/starrocks/start_fe_be.sh"),
63-
"/data/deploy/");
64-
try {
65-
oldStarRocks.execInContainer("chmod", "+x", "/data/deploy/start_fe_be.sh");
66-
} catch (Exception e) {
67-
e.printStackTrace();
68-
}
69-
oldStarRocks.getDockerClient()
70-
.commitCmd(oldStarRocks.getContainerId())
71-
.withRepository(NEW_STARROCKS_REPOSITORY)
72-
.withTag(NEW_STARROCKS_TAG).exec();
73-
oldStarRocks.stop();
74-
}
7559

7660
public static String getNewStarRocksImageName() {
7761
return NEW_STARROCKS_REPOSITORY + ":" + NEW_STARROCKS_TAG;

0 commit comments

Comments
 (0)