From e4c1ed46109a649ecdb890d0c649433c94f020f5 Mon Sep 17 00:00:00 2001 From: wudi <676366545@qq.com> Date: Tue, 26 Dec 2023 16:07:25 +0800 Subject: [PATCH 1/3] test ci --- .github/workflows/run-e2ecase-12.yml | 22 +++++++++++++- .github/workflows/run-e2ecase-20.yml | 44 ---------------------------- .github/workflows/run-itcase-12.yml | 22 +++++++++++++- .github/workflows/run-itcase-20.yml | 44 ---------------------------- 4 files changed, 42 insertions(+), 90 deletions(-) delete mode 100644 .github/workflows/run-e2ecase-20.yml delete mode 100644 .github/workflows/run-itcase-20.yml diff --git a/.github/workflows/run-e2ecase-12.yml b/.github/workflows/run-e2ecase-12.yml index fd89d20d8..671f2583c 100644 --- a/.github/workflows/run-e2ecase-12.yml +++ b/.github/workflows/run-e2ecase-12.yml @@ -22,7 +22,7 @@ on: push: jobs: - build-extension: + run-e2ecase-12: name: "Run E2ECases 1.2" runs-on: ubuntu-latest defaults: @@ -42,3 +42,23 @@ jobs: run: | cd flink-doris-connector && mvn test -Dtest="*E2ECase" -Dimage="adamlee489/doris:1.2.7.1_x86" + run-e2ecase-20: + need: run-e2ecase-12 + name: "Run E2ECases 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 deleted file mode 100644 index ebf7ae62d..000000000 --- a/.github/workflows/run-e2ecase-20.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 2.0 -on: - pull_request: - push: - -jobs: - build-extension: - name: "Run E2ECases 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" - diff --git a/.github/workflows/run-itcase-12.yml b/.github/workflows/run-itcase-12.yml index cd31c3ad5..e9470c2f4 100644 --- a/.github/workflows/run-itcase-12.yml +++ b/.github/workflows/run-itcase-12.yml @@ -22,7 +22,7 @@ on: push: jobs: - build-extension: + run-itcases-12: name: "Run ITCases 1.2" runs-on: ubuntu-latest defaults: @@ -42,3 +42,23 @@ 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 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 deleted file mode 100644 index ad9ef5a46..000000000 --- a/.github/workflows/run-itcase-20.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 2.0 -on: - pull_request: - push: - -jobs: - build-extension: - name: "Run ITCases 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" - From ff94c2265d0e9194b3f7c714856261267a381db8 Mon Sep 17 00:00:00 2001 From: wudi <676366545@qq.com> Date: Tue, 26 Dec 2023 16:18:16 +0800 Subject: [PATCH 2/3] update-0000 --- .github/workflows/build-extension.yml | 88 ++++++++++++++++++++------- .github/workflows/run-e2ecase-12.yml | 2 +- .github/workflows/run-itcase-12.yml | 2 +- 3 files changed, 68 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 7259bb43a..200eb7ff9 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -22,8 +22,8 @@ on: push: jobs: - build-extension: - name: "Build Extensions" + build-extension-1.15: + name: "Build Extensions Flink 1.15" runs-on: ubuntu-latest defaults: run: @@ -42,26 +42,70 @@ jobs: run: | cd flink-doris-connector && mvn clean package \ -Dflink.version=1.15.0 \ - -Dflink.minor.version=1.15 \ - -Dflink.python.id=flink-python_2.12 + -Dflink.minor.version=1.15 - - name: Build flink connector 1.16 - run: | - cd flink-doris-connector && mvn clean package \ - -Dflink.version=1.16.0 \ - -Dflink.minor.version=1.16 \ - -Dflink.python.id=flink-python + build-extension-1.16: + name: "Build Extensions Flink 1.16" + runs-on: ubuntu-latest + defaults: + run: + shell: bash + steps: + - name: Checkout + uses: actions/checkout@master - - name: Build flink connector 1.17 - run: | - cd flink-doris-connector && mvn clean package \ - -Dflink.version=1.17.0 \ - -Dflink.minor.version=1.17 \ - -Dflink.python.id=flink-python + - name: Setup java + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: '8' - - name: Build flink connector 1.18 - run: | - cd flink-doris-connector && mvn clean package \ - -Dflink.version=1.18.0 \ - -Dflink.minor.version=1.18 \ - -Dflink.python.id=flink-python + - name: Build flink connector 1.16 + run: | + cd flink-doris-connector && mvn clean package \ + -Dflink.version=1.16.0 \ + -Dflink.minor.version=1.16 + + build-extension-1.17: + name: "Build Extensions Flink 1.17" + 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: Build flink connector 1.17 + run: | + cd flink-doris-connector && mvn clean package \ + -Dflink.version=1.17.0 \ + -Dflink.minor.version=1.17 + + build-extension-1.18: + name: "Build Extensions Flink 1.18" + 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: Build flink connector 1.18 + run: | + cd flink-doris-connector && mvn clean package \ + -Dflink.version=1.18.0 \ + -Dflink.minor.version=1.18 \ No newline at end of file diff --git a/.github/workflows/run-e2ecase-12.yml b/.github/workflows/run-e2ecase-12.yml index 671f2583c..9169e5393 100644 --- a/.github/workflows/run-e2ecase-12.yml +++ b/.github/workflows/run-e2ecase-12.yml @@ -16,7 +16,7 @@ # under the License. # --- -name: Run E2ECases 1.2 +name: Run E2ECases on: pull_request: push: diff --git a/.github/workflows/run-itcase-12.yml b/.github/workflows/run-itcase-12.yml index e9470c2f4..b1dcca8dc 100644 --- a/.github/workflows/run-itcase-12.yml +++ b/.github/workflows/run-itcase-12.yml @@ -16,7 +16,7 @@ # under the License. # --- -name: Run ITCases 1.2 +name: Run ITCases on: pull_request: push: From 4389d490e99b1aad946c2b22e67444fa0f4bcff5 Mon Sep 17 00:00:00 2001 From: wudi <676366545@qq.com> Date: Tue, 26 Dec 2023 16:28:21 +0800 Subject: [PATCH 3/3] update-final-comment --- .github/workflows/build-extension.yml | 70 +-------------------------- .github/workflows/run-e2ecase-12.yml | 30 +++--------- .github/workflows/run-e2ecase-20.yml | 48 ++++++++++++++++++ .github/workflows/run-itcase-12.yml | 30 +++--------- .github/workflows/run-itcase-20.yml | 48 ++++++++++++++++++ 5 files changed, 112 insertions(+), 114 deletions(-) create mode 100644 .github/workflows/run-e2ecase-20.yml create mode 100644 .github/workflows/run-itcase-20.yml diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 200eb7ff9..1d37be071 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -22,8 +22,8 @@ on: push: jobs: - build-extension-1.15: - name: "Build Extensions Flink 1.15" + build-extension: + name: "Build Extensions" runs-on: ubuntu-latest defaults: run: @@ -43,69 +43,3 @@ jobs: cd flink-doris-connector && mvn clean package \ -Dflink.version=1.15.0 \ -Dflink.minor.version=1.15 - - build-extension-1.16: - name: "Build Extensions Flink 1.16" - 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: Build flink connector 1.16 - run: | - cd flink-doris-connector && mvn clean package \ - -Dflink.version=1.16.0 \ - -Dflink.minor.version=1.16 - - build-extension-1.17: - name: "Build Extensions Flink 1.17" - 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: Build flink connector 1.17 - run: | - cd flink-doris-connector && mvn clean package \ - -Dflink.version=1.17.0 \ - -Dflink.minor.version=1.17 - - build-extension-1.18: - name: "Build Extensions Flink 1.18" - 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: Build flink connector 1.18 - run: | - cd flink-doris-connector && mvn clean package \ - -Dflink.version=1.18.0 \ - -Dflink.minor.version=1.18 \ No newline at end of file diff --git a/.github/workflows/run-e2ecase-12.yml b/.github/workflows/run-e2ecase-12.yml index 9169e5393..100331807 100644 --- a/.github/workflows/run-e2ecase-12.yml +++ b/.github/workflows/run-e2ecase-12.yml @@ -16,14 +16,18 @@ # under the License. # --- -name: Run E2ECases +name: Run E2ECases 1.2 on: pull_request: push: +concurrency: + group: example + cancel-in-progress: true + jobs: - run-e2ecase-12: - name: "Run E2ECases 1.2" + build-extension: + name: "Run E2ECases On Doris 1.2" runs-on: ubuntu-latest defaults: run: @@ -42,23 +46,3 @@ jobs: run: | cd flink-doris-connector && mvn test -Dtest="*E2ECase" -Dimage="adamlee489/doris:1.2.7.1_x86" - run-e2ecase-20: - need: run-e2ecase-12 - name: "Run E2ECases 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..7e56e2c44 --- /dev/null +++ b/.github/workflows/run-e2ecase-20.yml @@ -0,0 +1,48 @@ +# 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: + +concurrency: + group: example + cancel-in-progress: true + +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" + diff --git a/.github/workflows/run-itcase-12.yml b/.github/workflows/run-itcase-12.yml index b1dcca8dc..f596d3c87 100644 --- a/.github/workflows/run-itcase-12.yml +++ b/.github/workflows/run-itcase-12.yml @@ -16,14 +16,18 @@ # 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: - name: "Run ITCases 1.2" + build-extension: + name: "Run ITCases On Doris 1.2" runs-on: ubuntu-latest defaults: run: @@ -42,23 +46,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 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..507f1e131 --- /dev/null +++ b/.github/workflows/run-itcase-20.yml @@ -0,0 +1,48 @@ +# 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: + +concurrency: + group: example + cancel-in-progress: true + +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" +