Skip to content

Commit 299ac28

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

File tree

7 files changed

+21
-23
lines changed

7 files changed

+21
-23
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

-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656

5757
import static org.apache.inlong.sort.tests.utils.StarRocksManager.INTER_CONTAINER_STAR_ROCKS_ALIAS;
5858
import static org.apache.inlong.sort.tests.utils.StarRocksManager.STAR_ROCKS_LOG;
59-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.buildStarRocksImage;
6059
import static org.apache.inlong.sort.tests.utils.StarRocksManager.getNewStarRocksImageName;
6160
import static org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStarRocksTable;
6261

@@ -83,7 +82,6 @@ public class Kafka2StarRocksTesta extends FlinkContainerTestEnv {
8382
URI kafkaSqlFile =
8483
Objects.requireNonNull(Kafka2StarRocksTesta.class.getResource("/flinkSql/kafka_test.sql")).toURI();
8584
sqlFile = Paths.get(kafkaSqlFile).toString();
86-
buildStarRocksImage();
8785
} catch (URISyntaxException e) {
8886
throw new RuntimeException(e);
8987
}

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-2
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@ public class Mongodb2StarRocksTesta extends FlinkContainerTestEnv {
8282

8383
static {
8484
try {
85-
sqlFile = Paths.get(Postgres2StarRocksTesta.class.getResource("/flinkSql/mongodb_test.sql").toURI())
85+
sqlFile = Paths.get(Postgres2StarRocksTest.class.getResource("/flinkSql/mongodb_test.sql").toURI())
8686
.toString();
87-
buildStarRocksImage();
8887
} catch (URISyntaxException e) {
8988
throw new RuntimeException(e);
9089
}

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

-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444

4545
import static org.apache.inlong.sort.tests.utils.StarRocksManager.INTER_CONTAINER_STAR_ROCKS_ALIAS;
4646
import static org.apache.inlong.sort.tests.utils.StarRocksManager.STAR_ROCKS_LOG;
47-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.buildStarRocksImage;
4847
import static org.apache.inlong.sort.tests.utils.StarRocksManager.getNewStarRocksImageName;
4948
import static org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStarRocksTable;
5049

@@ -65,7 +64,6 @@ public class Mysql2StarRocksTesta extends FlinkContainerTestEnv {
6564
try {
6665
sqlFile =
6766
Paths.get(Mysql2StarRocksTesta.class.getResource("/flinkSql/mysql_test.sql").toURI()).toString();
68-
buildStarRocksImage();
6967
} catch (URISyntaxException e) {
7068
throw new RuntimeException(e);
7169
}
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,15 @@
4545

4646
import static org.apache.inlong.sort.tests.utils.StarRocksManager.INTER_CONTAINER_STAR_ROCKS_ALIAS;
4747
import static org.apache.inlong.sort.tests.utils.StarRocksManager.STAR_ROCKS_LOG;
48-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.buildStarRocksImage;
4948
import static org.apache.inlong.sort.tests.utils.StarRocksManager.getNewStarRocksImageName;
5049
import static org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStarRocksTable;
5150
/**
5251
* End-to-end tests for sort-connector-postgres-cdc-v1.15 uber jar.
5352
* Test flink sql Postgres cdc to StarRocks
5453
*/
55-
public class Postgres2StarRocksTesta extends FlinkContainerTestEnv {
54+
public class Postgres2StarRocksTest extends FlinkContainerTestEnv {
5655

57-
private static final Logger LOG = LoggerFactory.getLogger(Postgres2StarRocksTesta.class);
56+
private static final Logger LOG = LoggerFactory.getLogger(Postgres2StarRocksTest.class);
5857

5958
private static final Path postgresJar = TestUtils.getResource("sort-connector-postgres-cdc.jar");
6059
private static final Path jdbcJar = TestUtils.getResource("sort-connector-starrocks.jar");
@@ -63,9 +62,8 @@ public class Postgres2StarRocksTesta extends FlinkContainerTestEnv {
6362

6463
static {
6564
try {
66-
sqlFile = Paths.get(Postgres2StarRocksTesta.class.getResource("/flinkSql/postgres_test.sql").toURI())
65+
sqlFile = Paths.get(Postgres2StarRocksTest.class.getResource("/flinkSql/postgres_test.sql").toURI())
6766
.toString();
68-
buildStarRocksImage();
6967
} catch (URISyntaxException e) {
7068
throw new RuntimeException(e);
7169
}

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

-10
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,11 @@ public class RedisToRedisTest extends FlinkContainerTestEnv {
5555
try {
5656
sqlFile = Paths.get(RedisToRedisTest.class.getResource("/flinkSql/redis_test.sql").toURI())
5757
.toString();
58-
buildStarRocksImage();
5958
} catch (URISyntaxException e) {
6059
throw new RuntimeException(e);
6160
}
6261
}
6362

64-
@ClassRule
65-
public static StarRocksContainer STAR_ROCKS =
66-
(StarRocksContainer) new StarRocksContainer(getNewStarRocksImageName())
67-
.withExposedPorts(9030, 8030, 8040)
68-
.withNetwork(NETWORK)
69-
.withAccessToHost(true)
70-
.withNetworkAliases(INTER_CONTAINER_STAR_ROCKS_ALIAS)
71-
.withLogConsumer(new Slf4jLogConsumer(STAR_ROCKS_LOG));
72-
7363
@ClassRule
7464
public static final RedisContainer REDIS_CONTAINER_SOURCE = new RedisContainer(
7565
DockerImageName.parse("redis:6.2.14"))

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

-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

4646
import static org.apache.inlong.sort.tests.utils.StarRocksManager.INTER_CONTAINER_STAR_ROCKS_ALIAS;
4747
import static org.apache.inlong.sort.tests.utils.StarRocksManager.STAR_ROCKS_LOG;
48-
import static org.apache.inlong.sort.tests.utils.StarRocksManager.buildStarRocksImage;
4948
import static org.apache.inlong.sort.tests.utils.StarRocksManager.getNewStarRocksImageName;
5049
import static org.apache.inlong.sort.tests.utils.StarRocksManager.initializeStarRocksTable;
5150

@@ -64,7 +63,6 @@ public class Sqlserver2StarRocksTesta extends FlinkContainerTestEnv {
6463
try {
6564
sqlFile = Paths.get(Sqlserver2StarRocksTesta.class.getResource("/flinkSql/sqlserver_test.sql").toURI())
6665
.toString();
67-
buildStarRocksImage();
6866
} catch (URISyntaxException e) {
6967
throw new RuntimeException(e);
7068
}

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

+17
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,23 @@ public class StarRocksManager {
3939
private static final String NEW_STARROCKS_TAG = "latest";
4040
private static final String STAR_ROCKS_IMAGE_NAME = "starrocks/allin1-ubi:3.0.4";
4141
public static final Logger STAR_ROCKS_LOG = LoggerFactory.getLogger(StarRocksContainer.class);
42+
43+
static {
44+
GenericContainer oldStarRocks = new GenericContainer(STAR_ROCKS_IMAGE_NAME);
45+
Startables.deepStart(Stream.of(oldStarRocks)).join();
46+
oldStarRocks.copyFileToContainer(MountableFile.forClasspathResource("/docker/starrocks/start_fe_be.sh"),
47+
"/data/deploy/");
48+
try {
49+
oldStarRocks.execInContainer("chmod", "+x", "/data/deploy/start_fe_be.sh");
50+
} catch (Exception e) {
51+
e.printStackTrace();
52+
}
53+
oldStarRocks.getDockerClient()
54+
.commitCmd(oldStarRocks.getContainerId())
55+
.withRepository(NEW_STARROCKS_REPOSITORY)
56+
.withTag(NEW_STARROCKS_TAG).exec();
57+
oldStarRocks.stop();
58+
}
4259
public static void buildStarRocksImage() {
4360
GenericContainer oldStarRocks = new GenericContainer(STAR_ROCKS_IMAGE_NAME);
4461
Startables.deepStart(Stream.of(oldStarRocks)).join();

0 commit comments

Comments
 (0)