From 2a1d3975fa2c93122e622dab3c628ef596f37a59 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 2 Feb 2024 11:47:00 +0800 Subject: [PATCH 1/4] chore(test): separate intergration tests (others) --- ci/workflows/main-cron.yml | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index 357de0fd0b692..9eb8a642a7d3d 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -280,6 +280,57 @@ steps: timeout_in_minutes: 70 retry: *auto-retry + - label: "integration test (deterministic simulation) - backfill_tests" + key: "integration-test-deterministic-others" + command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh backfill_tests::" + if: | + !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null + || build.pull_request.labels includes "ci/run-integration-test-deterministic-simulation" + || build.env("CI_STEPS") =~ /(^|,)integration-tests?-deterministic-simulation(,|$$)/ + depends_on: "build-simulation" + plugins: + - docker-compose#v4.9.0: + run: rw-build-env + config: ci/docker-compose.yml + mount-buildkite-agent: true + - ./ci/plugins/upload-failure-logs + timeout_in_minutes: 70 + retry: *auto-retry + + - label: "integration test (deterministic simulation) - storage" + key: "integration-test-deterministic-others" + command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh storage::" + if: | + !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null + || build.pull_request.labels includes "ci/run-integration-test-deterministic-simulation" + || build.env("CI_STEPS") =~ /(^|,)integration-tests?-deterministic-simulation(,|$$)/ + depends_on: "build-simulation" + plugins: + - docker-compose#v4.9.0: + run: rw-build-env + config: ci/docker-compose.yml + mount-buildkite-agent: true + - ./ci/plugins/upload-failure-logs + timeout_in_minutes: 70 + retry: *auto-retry + + - label: "integration test (deterministic simulation) - sink" + key: "integration-test-deterministic-others" + command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh sink::" + if: | + !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null + || build.pull_request.labels includes "ci/run-integration-test-deterministic-simulation" + || build.env("CI_STEPS") =~ /(^|,)integration-tests?-deterministic-simulation(,|$$)/ + depends_on: "build-simulation" + plugins: + - docker-compose#v4.9.0: + run: rw-build-env + config: ci/docker-compose.yml + mount-buildkite-agent: true + - ./ci/plugins/upload-failure-logs + timeout_in_minutes: 70 + retry: *auto-retry + - label: "end-to-end test (deterministic simulation)" key: "e2e-test-deterministic" command: "TEST_NUM=64 timeout 55m ci/scripts/deterministic-e2e-test.sh" From 08a893764e79a57cf930beed1e4b02de04c758c9 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 2 Feb 2024 11:47:12 +0800 Subject: [PATCH 2/4] rename. make the title shorter --- ci/workflows/main-cron.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index 9eb8a642a7d3d..e2a5f96d483ad 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -40,7 +40,7 @@ steps: timeout_in_minutes: 12 retry: *auto-retry - - label: "build (deterministic simulation)" + - label: "build simulation test" command: "ci/scripts/build-simulation.sh" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null @@ -214,7 +214,7 @@ steps: timeout_in_minutes: 22 retry: *auto-retry - - label: "unit test (deterministic simulation)" + - label: "unit test (madsim)" key: "unit-test-deterministic" command: "MADSIM_TEST_NUM=100 timeout 15m ci/scripts/deterministic-unit-test.sh" if: | @@ -229,7 +229,7 @@ steps: timeout_in_minutes: 15 retry: *auto-retry - - label: "integration test (deterministic simulation) - scale" + - label: "integration test (madsim) - scale" key: "integration-test-deterministic-scale" command: "TEST_NUM=60 ci/scripts/deterministic-it-test.sh scale::" if: | @@ -246,7 +246,7 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (deterministic simulation) - recovery" + - label: "integration test (madsim) - recovery" key: "integration-test-deterministic-recovery" command: "TEST_NUM=60 ci/scripts/deterministic-it-test.sh recovery::" if: | @@ -263,7 +263,7 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (deterministic simulation) - others" + - label: "integration test (madsim) - others" key: "integration-test-deterministic-others" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh backfill_tests:: storage:: sink::" if: | @@ -280,7 +280,7 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (deterministic simulation) - backfill_tests" + - label: "integration test (madsim) - backfill_tests" key: "integration-test-deterministic-others" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh backfill_tests::" if: | @@ -297,7 +297,7 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (deterministic simulation) - storage" + - label: "integration test (madsim) - storage" key: "integration-test-deterministic-others" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh storage::" if: | @@ -314,7 +314,7 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (deterministic simulation) - sink" + - label: "integration test (madsim) - sink" key: "integration-test-deterministic-others" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh sink::" if: | @@ -331,7 +331,7 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "end-to-end test (deterministic simulation)" + - label: "end-to-end test (madsim)" key: "e2e-test-deterministic" command: "TEST_NUM=64 timeout 55m ci/scripts/deterministic-e2e-test.sh" if: | @@ -353,7 +353,7 @@ steps: timeout_in_minutes: 60 retry: *auto-retry - - label: "recovery test (deterministic simulation)" + - label: "recovery test (madsim)" key: "recovery-test-deterministic" command: "TEST_NUM=12 KILL_RATE=1.0 BACKGROUND_DDL_RATE=0.0 timeout 55m ci/scripts/deterministic-recovery-test.sh" if: | @@ -372,7 +372,7 @@ steps: retry: *auto-retry # Ddl statements will randomly run with background_ddl. - - label: "background_ddl, arrangement_backfill recovery test (deterministic simulation)" + - label: "background_ddl, arrangement_backfill recovery test (madsim)" key: "background-ddl-arrangement-backfill-recovery-test-deterministic" command: "TEST_NUM=12 KILL_RATE=1.0 BACKGROUND_DDL_RATE=0.8 USE_ARRANGEMENT_BACKFILL=--use-arrangement-backfill timeout 55m ci/scripts/deterministic-recovery-test.sh" if: | @@ -391,7 +391,7 @@ steps: retry: *auto-retry # Ddl statements will randomly run with background_ddl. - - label: "background_ddl recovery test (deterministic simulation)" + - label: "background_ddl recovery test (madsim)" key: "background-ddl-recovery-test-deterministic" command: "TEST_NUM=12 KILL_RATE=1.0 BACKGROUND_DDL_RATE=0.8 timeout 55m ci/scripts/deterministic-recovery-test.sh" if: | From 29f2628d3f16c72c18f226c4735fee9952f4b8f6 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 2 Feb 2024 11:49:52 +0800 Subject: [PATCH 3/4] oops... --- ci/workflows/main-cron.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index e2a5f96d483ad..9ed67d1630d7d 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -263,23 +263,6 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (madsim) - others" - key: "integration-test-deterministic-others" - command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh backfill_tests:: storage:: sink::" - if: | - !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null - || build.pull_request.labels includes "ci/run-integration-test-deterministic-simulation" - || build.env("CI_STEPS") =~ /(^|,)integration-tests?-deterministic-simulation(,|$$)/ - depends_on: "build-simulation" - plugins: - - docker-compose#v4.9.0: - run: rw-build-env - config: ci/docker-compose.yml - mount-buildkite-agent: true - - ./ci/plugins/upload-failure-logs - timeout_in_minutes: 70 - retry: *auto-retry - - label: "integration test (madsim) - backfill_tests" key: "integration-test-deterministic-others" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh backfill_tests::" From f73966617f84232ea448c99d46d7e6b97a491811 Mon Sep 17 00:00:00 2001 From: Eric Fu Date: Fri, 2 Feb 2024 13:00:47 +0800 Subject: [PATCH 4/4] fix step key --- ci/workflows/main-cron.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index 9ed67d1630d7d..fab1f958f717e 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -263,8 +263,8 @@ steps: timeout_in_minutes: 70 retry: *auto-retry - - label: "integration test (madsim) - backfill_tests" - key: "integration-test-deterministic-others" + - label: "integration test (madsim) - backfill" + key: "integration-test-deterministic-backfill" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh backfill_tests::" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null @@ -281,7 +281,7 @@ steps: retry: *auto-retry - label: "integration test (madsim) - storage" - key: "integration-test-deterministic-others" + key: "integration-test-deterministic-storage" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh storage::" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null @@ -298,7 +298,7 @@ steps: retry: *auto-retry - label: "integration test (madsim) - sink" - key: "integration-test-deterministic-others" + key: "integration-test-deterministic-sink" command: "TEST_NUM=30 ci/scripts/deterministic-it-test.sh sink::" if: | !(build.pull_request.labels includes "ci/main-cron/skip-ci") && build.env("CI_STEPS") == null