From 085051f081ec5b1d8c87f4c8ec0008df795d8c17 Mon Sep 17 00:00:00 2001 From: wudi <676366545@qq.com> Date: Tue, 5 Mar 2024 11:44:56 +0800 Subject: [PATCH] update --- .github/workflows/run-e2ecase-12.yml | 44 ------------------- .../{run-e2ecase-20.yml => run-e2ecase.yml} | 0 .github/workflows/run-itcase-12.yml | 44 ------------------- .../{run-itcase-20.yml => run-itcase.yml} | 0 .../org/apache/doris/flink/DorisTestBase.java | 3 +- 5 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 .github/workflows/run-e2ecase-12.yml rename .github/workflows/{run-e2ecase-20.yml => run-e2ecase.yml} (100%) delete mode 100644 .github/workflows/run-itcase-12.yml rename .github/workflows/{run-itcase-20.yml => run-itcase.yml} (100%) diff --git a/.github/workflows/run-e2ecase-12.yml b/.github/workflows/run-e2ecase-12.yml deleted file mode 100644 index fd89d20d8..000000000 --- a/.github/workflows/run-e2ecase-12.yml +++ /dev/null @@ -1,44 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---- -name: Run E2ECases 1.2 -on: - pull_request: - push: - -jobs: - build-extension: - name: "Run E2ECases 1.2" - runs-on: ubuntu-latest - defaults: - run: - shell: bash - steps: - - name: Checkout - uses: actions/checkout@master - - - name: Setup java - uses: actions/setup-java@v2 - with: - distribution: adopt - java-version: '8' - - - name: Run E2ECases - run: | - cd flink-doris-connector && mvn test -Dtest="*E2ECase" -Dimage="adamlee489/doris:1.2.7.1_x86" - diff --git a/.github/workflows/run-e2ecase-20.yml b/.github/workflows/run-e2ecase.yml similarity index 100% rename from .github/workflows/run-e2ecase-20.yml rename to .github/workflows/run-e2ecase.yml diff --git a/.github/workflows/run-itcase-12.yml b/.github/workflows/run-itcase-12.yml deleted file mode 100644 index cd31c3ad5..000000000 --- a/.github/workflows/run-itcase-12.yml +++ /dev/null @@ -1,44 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---- -name: Run ITCases 1.2 -on: - pull_request: - push: - -jobs: - build-extension: - name: "Run ITCases 1.2" - runs-on: ubuntu-latest - defaults: - run: - shell: bash - steps: - - name: Checkout - uses: actions/checkout@master - - - name: Setup java - uses: actions/setup-java@v2 - with: - distribution: adopt - java-version: '8' - - - name: Run ITCases - run: | - cd flink-doris-connector && mvn test -Dtest="*ITCase" -Dimage="adamlee489/doris:1.2.7.1_x86" - diff --git a/.github/workflows/run-itcase-20.yml b/.github/workflows/run-itcase.yml similarity index 100% rename from .github/workflows/run-itcase-20.yml rename to .github/workflows/run-itcase.yml diff --git a/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisTestBase.java b/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisTestBase.java index ca857e0ea..7b19f74f8 100644 --- a/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisTestBase.java +++ b/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisTestBase.java @@ -100,8 +100,7 @@ public static GenericContainer createDorisContainer() { .withPrivilegedMode(true) .withLogConsumer( new Slf4jLogConsumer( - DockerLoggerFactory.getLogger(DORIS_DOCKER_IMAGE))) - .withReuse(true); + DockerLoggerFactory.getLogger(DORIS_DOCKER_IMAGE))); container.setPortBindings( Lists.newArrayList(