Skip to content

Commit a5b666a

Browse files
authored
[FLINK-35503] Add support for running Oracle connector unit test on ARM architecture (#3600)
1 parent 4b4b8ea commit a5b666a

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceTestBase.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.junit.Rule;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
32+
import org.testcontainers.DockerClientFactory;
3233
import org.testcontainers.containers.OracleContainer;
3334
import org.testcontainers.containers.output.Slf4jLogConsumer;
3435
import org.testcontainers.lifecycle.Startables;
@@ -73,7 +74,16 @@ public class OracleSourceTestBase extends TestLogger {
7374

7475
public static final OracleContainer ORACLE_CONTAINER =
7576
new OracleContainer(
76-
DockerImageName.parse("goodboy008/oracle-19.3.0-ee").withTag("non-cdb"))
77+
DockerImageName.parse("goodboy008/oracle-19.3.0-ee")
78+
.withTag(
79+
DockerClientFactory.instance()
80+
.client()
81+
.versionCmd()
82+
.exec()
83+
.getArch()
84+
.equals("amd64")
85+
? "non-cdb"
86+
: "arm-non-cdb"))
7787
.withUsername(CONNECTOR_USER)
7888
.withPassword(CONNECTOR_PWD)
7989
.withDatabaseName(ORACLE_DATABASE)

flink-cdc-connect/flink-cdc-source-connectors/flink-connector-oracle-cdc/src/test/java/org/apache/flink/cdc/connectors/oracle/table/OracleConnectorITCase.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,9 @@ public void testAllDataTypes() throws Throwable {
843843

844844
@Test
845845
public void testSnapshotToStreamingSwitchPendingTransactions() throws Exception {
846+
847+
createAndInitialize("product.sql");
848+
846849
Assume.assumeFalse(parallelismSnapshot);
847850

848851
CompletableFuture<Void> finishFuture = createRecordInserters();

flink-cdc-e2e-tests/flink-cdc-source-e2e-tests/src/test/java/org/apache/flink/cdc/connectors/tests/OracleE2eITCase.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.junit.Test;
2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
29+
import org.testcontainers.DockerClientFactory;
2930
import org.testcontainers.containers.OracleContainer;
3031
import org.testcontainers.containers.output.Slf4jLogConsumer;
3132
import org.testcontainers.lifecycle.Startables;
@@ -66,7 +67,17 @@ public void before() {
6667
LOG.info("Starting containers...");
6768

6869
oracle =
69-
new OracleContainer(DockerImageName.parse(ORACLE_IMAGE).withTag("non-cdb"))
70+
new OracleContainer(
71+
DockerImageName.parse(ORACLE_IMAGE)
72+
.withTag(
73+
DockerClientFactory.instance()
74+
.client()
75+
.versionCmd()
76+
.exec()
77+
.getArch()
78+
.equals("amd64")
79+
? "non-cdb"
80+
: "arm-non-cdb"))
7081
.withUsername(CONNECTOR_USER)
7182
.withPassword(CONNECTOR_PWD)
7283
.withDatabaseName(ORACLE_DATABASE)

0 commit comments

Comments
 (0)