From 62a1d5e190803b3eb968a760cc278ab67b187717 Mon Sep 17 00:00:00 2001 From: lmatz Date: Tue, 19 Mar 2024 10:09:11 +0800 Subject: [PATCH] fix(ci): remove doris sink ci (#15332) (#15759) Co-authored-by: Xinhao Xu <84456268+xxhZs@users.noreply.github.com> --- ci/docker-compose.yml | 51 ------------------------------ ci/workflows/main-cron.yml | 59 ++++++++++++++++++----------------- ci/workflows/pull-request.yml | 47 ++++++++++++++-------------- 3 files changed, 54 insertions(+), 103 deletions(-) diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index ca5c557d3d848..6c96a14a67f81 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -96,18 +96,6 @@ services: volumes: - ..:/risingwave - sink-doris-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231109 - depends_on: - - doris-fe-server - - doris-be-server - volumes: - - ..:/risingwave - command: > - sh -c "sudo sysctl -w vm.max_map_count=2000000" - networks: - mynetwork: - ipv4_address: 172.121.0.4 rw-build-env: image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240313 @@ -189,39 +177,6 @@ services: timeout: 30s retries: 50 - doris-fe-server: - platform: linux/amd64 - image: apache/doris:2.0.0_alpha-fe-x86_64 - hostname: doris-fe-server - command: > - sh -c "sudo sysctl -w vm.max_map_count=2000000" - environment: - - FE_SERVERS=fe1:172.121.0.2:9010 - - FE_ID=1 - ports: - - "8030:8030" - - "9030:9030" - networks: - mynetwork: - ipv4_address: 172.121.0.2 - - doris-be-server: - platform: linux/amd64 - image: apache/doris:2.0.0_alpha-be-x86_64 - hostname: doris-be-server - command: > - sh -c "sudo sysctl -w vm.max_map_count=2000000" - environment: - - FE_SERVERS=fe1:172.121.0.2:9010 - - BE_ADDR=172.121.0.3:9050 - depends_on: - - doris-fe-server - ports: - - "9050:9050" - networks: - mynetwork: - ipv4_address: 172.121.0.3 - cassandra-server: container_name: cassandra-server image: cassandra:4.0 @@ -319,9 +274,3 @@ services: interval: 5s timeout: 5s retries: 5 -networks: - mynetwork: - ipam: - config: - - subnet: 172.121.80.0/16 - default: diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index f04dbb060d02e..3120698b6b001 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -800,36 +800,37 @@ steps: timeout_in_minutes: 10 retry: *auto-retry - - label: "set vm_max_map_count_2000000" - key: "set-vm_max_map_count" - if: | - !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null - || build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" - || build.env("CI_STEPS") =~ /(^|,)e2e-doris-sink-tests?(,|$$)/ - command: "sudo sysctl -w vm.max_map_count=2000000" - depends_on: - - "build" - - "build-other" + # Causes ci error, close it first, fix it later + # - label: "set vm_max_map_count_2000000" + # key: "set-vm_max_map_count" + # if: | + # !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null + # || build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" + # || build.env("CI_STEPS") =~ /(^|,)e2e-doris-sink-tests?(,|$$)/ + # command: "sudo sysctl -w vm.max_map_count=2000000" + # depends_on: + # - "build" + # - "build-other" - - label: "end-to-end doris sink test" - key: "e2e-doris-sink-tests" - command: "ci/scripts/e2e-doris-sink-test.sh -p ci-release" - if: | - !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null - || build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" - || build.env("CI_STEPS") =~ /(^|,)e2e-doris-sink-tests?(,|$$)/ - depends_on: - - "build" - - "build-other" - - "set-vm_max_map_count" - plugins: - - docker-compose#v4.9.0: - run: sink-doris-env - config: ci/docker-compose.yml - mount-buildkite-agent: true - - ./ci/plugins/upload-failure-logs - timeout_in_minutes: 10 - retry: *auto-retry + # - label: "end-to-end doris sink test" + # key: "e2e-doris-sink-tests" + # command: "ci/scripts/e2e-doris-sink-test.sh -p ci-release" + # if: | + # !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null + # || build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" + # || build.env("CI_STEPS") =~ /(^|,)e2e-doris-sink-tests?(,|$$)/ + # depends_on: + # - "build" + # - "build-other" + # - "set-vm_max_map_count" + # plugins: + # - docker-compose#v5.1.0: + # run: sink-doris-env + # config: ci/docker-compose.yml + # mount-buildkite-agent: true + # - ./ci/plugins/upload-failure-logs + # timeout_in_minutes: 10 + # retry: *auto-retry - label: "end-to-end starrocks sink test" key: "e2e-starrocks-sink-tests" diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml index 76675cf9fe97d..0f1be04098ccc 100644 --- a/ci/workflows/pull-request.yml +++ b/ci/workflows/pull-request.yml @@ -307,29 +307,30 @@ steps: timeout_in_minutes: 10 retry: *auto-retry - - label: "set vm_max_map_count_2000000" - key: "set-vm_max_map_count" - if: build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-doris-sink-tests?(,|$$)/ - command: "sudo sysctl -w vm.max_map_count=2000000" - depends_on: - - "build" - - "build-other" - - - label: "end-to-end doris sink test" - if: build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-doris-sink-tests?(,|$$)/ - command: "ci/scripts/e2e-doris-sink-test.sh -p ci-dev" - depends_on: - - "build" - - "build-other" - - "set-vm_max_map_count" - plugins: - - docker-compose#v4.9.0: - run: sink-doris-env - config: ci/docker-compose.yml - mount-buildkite-agent: true - - ./ci/plugins/upload-failure-logs - timeout_in_minutes: 10 - retry: *auto-retry + # Causes ci error, close it first, fix it later + # - label: "set vm_max_map_count_2000000" + # key: "set-vm_max_map_count" + # if: build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-doris-sink-tests?(,|$$)/ + # command: "sudo sysctl -w vm.max_map_count=2000000" + # depends_on: + # - "build" + # - "build-other" + + # - label: "end-to-end doris sink test" + # if: build.pull_request.labels includes "ci/run-e2e-doris-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-doris-sink-tests?(,|$$)/ + # command: "ci/scripts/e2e-doris-sink-test.sh -p ci-dev" + # depends_on: + # - "build" + # - "build-other" + # - "set-vm_max_map_count" + # plugins: + # - docker-compose#v5.1.0: + # run: sink-doris-env + # config: ci/docker-compose.yml + # mount-buildkite-agent: true + # - ./ci/plugins/upload-failure-logs + # timeout_in_minutes: 10 + # retry: *auto-retry - label: "end-to-end starrocks sink test" if: build.pull_request.labels includes "ci/run-e2e-starrocks-sink-tests" || build.env("CI_STEPS") =~ /(^|,) e2e-starrocks-sink-tests?(,|$$)/