Skip to content

Commit

Permalink
fix(ci): remove doris sink ci (#15332) (#15759)
Browse files Browse the repository at this point in the history
Co-authored-by: Xinhao Xu <[email protected]>
  • Loading branch information
lmatz and xxhZs authored Mar 19, 2024
1 parent 436e7df commit 62a1d5e
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 103 deletions.
51 changes: 0 additions & 51 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -319,9 +274,3 @@ services:
interval: 5s
timeout: 5s
retries: 5
networks:
mynetwork:
ipam:
config:
- subnet: 172.121.80.0/16
default:
59 changes: 30 additions & 29 deletions ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
47 changes: 24 additions & 23 deletions ci/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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?(,|$$)/
Expand Down

0 comments on commit 62a1d5e

Please sign in to comment.