From 4e171cb5198bb81afefac259701a5b13affbcecf Mon Sep 17 00:00:00 2001 From: wudi <676366545@qq.com> Date: Tue, 26 Dec 2023 17:55:10 +0800 Subject: [PATCH] update --- .../{run-e2ecase.yml => run-e2ecase-12.yml} | 28 +----------- .github/workflows/run-e2ecase-20.yml | 44 +++++++++++++++++++ .../{run-itcase.yml => run-itcase-12.yml} | 28 +----------- .github/workflows/run-itcase-20.yml | 44 +++++++++++++++++++ 4 files changed, 92 insertions(+), 52 deletions(-) rename .github/workflows/{run-e2ecase.yml => run-e2ecase-12.yml} (67%) create mode 100644 .github/workflows/run-e2ecase-20.yml rename .github/workflows/{run-itcase.yml => run-itcase-12.yml} (68%) create mode 100644 .github/workflows/run-itcase-20.yml diff --git a/.github/workflows/run-e2ecase.yml b/.github/workflows/run-e2ecase-12.yml similarity index 67% rename from .github/workflows/run-e2ecase.yml rename to .github/workflows/run-e2ecase-12.yml index 9c7a0bd72..7c106b207 100644 --- a/.github/workflows/run-e2ecase.yml +++ b/.github/workflows/run-e2ecase-12.yml @@ -16,17 +16,13 @@ # under the License. # --- -name: Run E2ECases +name: Run E2ECases 1.2 on: pull_request: push: -concurrency: - group: example - cancel-in-progress: true - jobs: - run-e2e-case-12: + build-extension: name: "Run E2ECases On Doris 1.2" runs-on: ubuntu-latest defaults: @@ -46,23 +42,3 @@ jobs: run: | cd flink-doris-connector && mvn test -Dtest="*E2ECase" -Dimage="adamlee489/doris:1.2.7.1_x86" - run-e2e-case-20: - needs: run-e2e-case-12 - name: "Run E2ECases On Doris 2.0" - 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:2.0.3" \ No newline at end of file diff --git a/.github/workflows/run-e2ecase-20.yml b/.github/workflows/run-e2ecase-20.yml new file mode 100644 index 000000000..11a0f26fe --- /dev/null +++ b/.github/workflows/run-e2ecase-20.yml @@ -0,0 +1,44 @@ +# 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 2.0 +on: + pull_request: + push: + +jobs: + build-extension: + name: "Run E2ECases On Doris 2.0" + 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:2.0.3_x64" + diff --git a/.github/workflows/run-itcase.yml b/.github/workflows/run-itcase-12.yml similarity index 68% rename from .github/workflows/run-itcase.yml rename to .github/workflows/run-itcase-12.yml index 01ecf3066..294f8123e 100644 --- a/.github/workflows/run-itcase.yml +++ b/.github/workflows/run-itcase-12.yml @@ -16,17 +16,13 @@ # under the License. # --- -name: Run ITCases +name: Run ITCases 1.2 on: pull_request: push: -concurrency: - group: example - cancel-in-progress: true - jobs: - run-itcases-12: + build-extension: name: "Run ITCases On Doris 1.2" runs-on: ubuntu-latest defaults: @@ -46,23 +42,3 @@ jobs: run: | cd flink-doris-connector && mvn test -Dtest="*ITCase" -Dimage="adamlee489/doris:1.2.7.1_x86" - run-itcases-20: - needs: run-itcases-12 - name: "Run ITCases On Doris 2.0" - 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:2.0.3" \ No newline at end of file diff --git a/.github/workflows/run-itcase-20.yml b/.github/workflows/run-itcase-20.yml new file mode 100644 index 000000000..7391d37c7 --- /dev/null +++ b/.github/workflows/run-itcase-20.yml @@ -0,0 +1,44 @@ +# 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 2.0 +on: + pull_request: + push: + +jobs: + build-extension: + name: "Run ITCases On Doris 2.0" + 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:2.0.3_x64" +