[INLONG-9402][Sort] Change the flink docker java version and adjust c…

…ode structure.
XiaoYou201 · Apr 8, 2024 · 2c68864 · 2c68864
1 parent 33b8695
commit 2c68864
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...d-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/FlinkContainerTestEnv.java b/...d-tests-v1.13/src/test/java/org/apache/inlong/sort/tests/utils/FlinkContainerTestEnv.java
@@ -129,15 +129,15 @@ public abstract class FlinkContainerTestEnv extends TestLogger {
  public static void before() {
  LOG.info("Starting containers...");
  jobManager =
- new GenericContainer<>("flink:1.13.5-scala_2.11")
+ new GenericContainer<>("flink:1.13.5-scala_2.11-java8")
  .withCommand("jobmanager")
  .withNetwork(NETWORK)
  .withNetworkAliases(INTER_CONTAINER_JM_ALIAS)
  .withExposedPorts(JOB_MANAGER_REST_PORT, DEBUG_PORT)
  .withEnv("FLINK_PROPERTIES", FLINK_PROPERTIES)
  .withLogConsumer(new Slf4jLogConsumer(JM_LOG));
  taskManager =
- new GenericContainer<>("flink:1.13.5-scala_2.11")
+ new GenericContainer<>("flink:1.13.5-scala_2.11-java8")
  .withCommand("taskmanager")
  .withNetwork(NETWORK)
  .withNetworkAliases(INTER_CONTAINER_TM_ALIAS)
@@ -185,8 +185,8 @@ public void submitSQLJob(String sqlFile, Path... jars)
  ExecResult execResult =
  jobManager.execInContainer("bash", "-c", String.join(" ", commands));
  LOG.info(execResult.getStdout());
- LOG.error(execResult.getStderr());
  if (execResult.getExitCode() != 0) {
+ LOG.error(execResult.getStderr());
  throw new AssertionError("Failed when submitting the SQL job.");
  }
  }

diff --git a/...d-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/FlinkContainerTestEnv.java b/...d-tests-v1.15/src/test/java/org/apache/inlong/sort/tests/utils/FlinkContainerTestEnv.java
@@ -165,8 +165,8 @@ public void submitSQLJob(String sqlFile, Path... jars)
  ExecResult execResult =
  jobManager.execInContainer("bash", "-c", String.join(" ", commands));
  LOG.info(execResult.getStdout());
- LOG.error(execResult.getStderr());
  if (execResult.getExitCode() != 0) {
+ LOG.error(execResult.getStderr());
  throw new AssertionError("Failed when submitting the SQL job.");
  }
  }