From ef6988c9a087a693e3ae4e030b1350eb79a2fb69 Mon Sep 17 00:00:00 2001 From: Noel Kwan Date: Mon, 10 Jun 2024 17:46:56 +0800 Subject: [PATCH 1/2] refactor backwards-compat-tests into e2e --- Makefile.toml | 2 +- ci/scripts/backwards-compat-test.sh | 2 +- .../backwards-compat-tests}/README.md | 0 .../backwards-compat-tests}/scripts/run_local.sh | 2 +- .../backwards-compat-tests}/scripts/utils.sh | 4 ++-- .../backwards-compat-tests}/slt/basic/seed.slt | 0 .../backwards-compat-tests}/slt/basic/validate_original.slt | 0 .../backwards-compat-tests}/slt/basic/validate_restart.slt | 0 .../slt/kafka/invalid_options/seed.slt | 0 .../slt/kafka/invalid_options/validate_original.slt | 0 .../slt/kafka/invalid_options/validate_restart.slt | 0 .../backwards-compat-tests}/slt/kafka/seed.slt | 0 .../slt/kafka/upsert/deprecate_upsert.slt | 0 .../slt/kafka/upsert/include_key_as.slt | 0 .../backwards-compat-tests}/slt/kafka/validate_original.slt | 0 .../backwards-compat-tests}/slt/kafka/validate_restart.slt | 0 .../slt/nexmark-backwards-compat/delete.slt.part | 0 .../slt/nexmark-backwards-compat/insert.slt | 0 .../slt/nexmark-backwards-compat/seed.slt | 0 .../slt/nexmark-backwards-compat/validate_original.slt | 0 .../slt/nexmark-backwards-compat/validate_restart.slt | 0 .../slt/tpch-backwards-compat/delete.slt.part | 0 .../slt/tpch-backwards-compat/insert.slt.part | 0 .../slt/tpch-backwards-compat/seed.slt | 0 .../slt/tpch-backwards-compat/validate_original.slt | 0 .../slt/tpch-backwards-compat/validate_restart.slt | 0 26 files changed, 5 insertions(+), 5 deletions(-) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/README.md (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/scripts/run_local.sh (96%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/scripts/utils.sh (98%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/basic/seed.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/basic/validate_original.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/basic/validate_restart.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/invalid_options/seed.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/invalid_options/validate_original.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/invalid_options/validate_restart.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/seed.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/upsert/deprecate_upsert.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/upsert/include_key_as.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/validate_original.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/kafka/validate_restart.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/nexmark-backwards-compat/delete.slt.part (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/nexmark-backwards-compat/insert.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/nexmark-backwards-compat/seed.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/nexmark-backwards-compat/validate_original.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/nexmark-backwards-compat/validate_restart.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/tpch-backwards-compat/delete.slt.part (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/tpch-backwards-compat/insert.slt.part (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/tpch-backwards-compat/seed.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/tpch-backwards-compat/validate_original.slt (100%) rename {backwards-compat-tests => e2e_test/backwards-compat-tests}/slt/tpch-backwards-compat/validate_restart.slt (100%) diff --git a/Makefile.toml b/Makefile.toml index a154f0ba60db..1e618b1aed6b 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1417,7 +1417,7 @@ UPDATE_EXPECT=1 cargo test -p risingwave_connector tests::test_with_options_yaml [tasks.backwards-compat-test] category = "RiseDev - Test - Backwards Compatibility Test" description = "Run backwards compatibility test" -script = "./backwards-compat-tests/scripts/run_local.sh" +script = "./e2e_test/backwards-compat-tests/scripts/run_local.sh" # For debugging. # To show the env for a specific task, use `run_task = "show-env"` for that task. diff --git a/ci/scripts/backwards-compat-test.sh b/ci/scripts/backwards-compat-test.sh index 9089be7a1bdc..90a01f57a51c 100755 --- a/ci/scripts/backwards-compat-test.sh +++ b/ci/scripts/backwards-compat-test.sh @@ -32,7 +32,7 @@ else exit 1 fi -source backwards-compat-tests/scripts/utils.sh +source e2e_test/backwards-compat-tests/scripts/utils.sh ################################### Main diff --git a/backwards-compat-tests/README.md b/e2e_test/backwards-compat-tests/README.md similarity index 100% rename from backwards-compat-tests/README.md rename to e2e_test/backwards-compat-tests/README.md diff --git a/backwards-compat-tests/scripts/run_local.sh b/e2e_test/backwards-compat-tests/scripts/run_local.sh similarity index 96% rename from backwards-compat-tests/scripts/run_local.sh rename to e2e_test/backwards-compat-tests/scripts/run_local.sh index e2604e6a114e..7ac952e6d1c4 100755 --- a/backwards-compat-tests/scripts/run_local.sh +++ b/e2e_test/backwards-compat-tests/scripts/run_local.sh @@ -10,7 +10,7 @@ on_exit() { trap on_exit EXIT -source backwards-compat-tests/scripts/utils.sh +source e2e_test/backwards-compat-tests/scripts/utils.sh configure_rw() { VERSION="$1" diff --git a/backwards-compat-tests/scripts/utils.sh b/e2e_test/backwards-compat-tests/scripts/utils.sh similarity index 98% rename from backwards-compat-tests/scripts/utils.sh rename to e2e_test/backwards-compat-tests/scripts/utils.sh index 6b5184b2bb0e..8f41dad0860f 100644 --- a/backwards-compat-tests/scripts/utils.sh +++ b/e2e_test/backwards-compat-tests/scripts/utils.sh @@ -18,9 +18,9 @@ RECOVERY_DURATION=20 # Setup test directory -TEST_DIR=.risingwave/backwards-compat-tests/ +TEST_DIR=.risingwave/e2e_test/backwards-compat-tests/ mkdir -p $TEST_DIR -cp -r backwards-compat-tests/slt/* $TEST_DIR +cp -r e2e_test/backwards-compat-tests/slt/* $TEST_DIR wait_for_process() { process_name="$1" diff --git a/backwards-compat-tests/slt/basic/seed.slt b/e2e_test/backwards-compat-tests/slt/basic/seed.slt similarity index 100% rename from backwards-compat-tests/slt/basic/seed.slt rename to e2e_test/backwards-compat-tests/slt/basic/seed.slt diff --git a/backwards-compat-tests/slt/basic/validate_original.slt b/e2e_test/backwards-compat-tests/slt/basic/validate_original.slt similarity index 100% rename from backwards-compat-tests/slt/basic/validate_original.slt rename to e2e_test/backwards-compat-tests/slt/basic/validate_original.slt diff --git a/backwards-compat-tests/slt/basic/validate_restart.slt b/e2e_test/backwards-compat-tests/slt/basic/validate_restart.slt similarity index 100% rename from backwards-compat-tests/slt/basic/validate_restart.slt rename to e2e_test/backwards-compat-tests/slt/basic/validate_restart.slt diff --git a/backwards-compat-tests/slt/kafka/invalid_options/seed.slt b/e2e_test/backwards-compat-tests/slt/kafka/invalid_options/seed.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/invalid_options/seed.slt rename to e2e_test/backwards-compat-tests/slt/kafka/invalid_options/seed.slt diff --git a/backwards-compat-tests/slt/kafka/invalid_options/validate_original.slt b/e2e_test/backwards-compat-tests/slt/kafka/invalid_options/validate_original.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/invalid_options/validate_original.slt rename to e2e_test/backwards-compat-tests/slt/kafka/invalid_options/validate_original.slt diff --git a/backwards-compat-tests/slt/kafka/invalid_options/validate_restart.slt b/e2e_test/backwards-compat-tests/slt/kafka/invalid_options/validate_restart.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/invalid_options/validate_restart.slt rename to e2e_test/backwards-compat-tests/slt/kafka/invalid_options/validate_restart.slt diff --git a/backwards-compat-tests/slt/kafka/seed.slt b/e2e_test/backwards-compat-tests/slt/kafka/seed.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/seed.slt rename to e2e_test/backwards-compat-tests/slt/kafka/seed.slt diff --git a/backwards-compat-tests/slt/kafka/upsert/deprecate_upsert.slt b/e2e_test/backwards-compat-tests/slt/kafka/upsert/deprecate_upsert.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/upsert/deprecate_upsert.slt rename to e2e_test/backwards-compat-tests/slt/kafka/upsert/deprecate_upsert.slt diff --git a/backwards-compat-tests/slt/kafka/upsert/include_key_as.slt b/e2e_test/backwards-compat-tests/slt/kafka/upsert/include_key_as.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/upsert/include_key_as.slt rename to e2e_test/backwards-compat-tests/slt/kafka/upsert/include_key_as.slt diff --git a/backwards-compat-tests/slt/kafka/validate_original.slt b/e2e_test/backwards-compat-tests/slt/kafka/validate_original.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/validate_original.slt rename to e2e_test/backwards-compat-tests/slt/kafka/validate_original.slt diff --git a/backwards-compat-tests/slt/kafka/validate_restart.slt b/e2e_test/backwards-compat-tests/slt/kafka/validate_restart.slt similarity index 100% rename from backwards-compat-tests/slt/kafka/validate_restart.slt rename to e2e_test/backwards-compat-tests/slt/kafka/validate_restart.slt diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt.part b/e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt.part similarity index 100% rename from backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt.part rename to e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt.part diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/insert.slt b/e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/insert.slt similarity index 100% rename from backwards-compat-tests/slt/nexmark-backwards-compat/insert.slt rename to e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/insert.slt diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/seed.slt b/e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/seed.slt similarity index 100% rename from backwards-compat-tests/slt/nexmark-backwards-compat/seed.slt rename to e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/seed.slt diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/validate_original.slt b/e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/validate_original.slt similarity index 100% rename from backwards-compat-tests/slt/nexmark-backwards-compat/validate_original.slt rename to e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/validate_original.slt diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt b/e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt similarity index 100% rename from backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt rename to e2e_test/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/delete.slt.part b/e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/delete.slt.part similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/delete.slt.part rename to e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/delete.slt.part diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/insert.slt.part b/e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/insert.slt.part similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/insert.slt.part rename to e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/insert.slt.part diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/seed.slt b/e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/seed.slt similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/seed.slt rename to e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/seed.slt diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/validate_original.slt b/e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/validate_original.slt similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/validate_original.slt rename to e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/validate_original.slt diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt b/e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt rename to e2e_test/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt From aecf3b1e773d8e75b55a3c0ffc8082ea10391aba Mon Sep 17 00:00:00 2001 From: Noel Kwan Date: Mon, 10 Jun 2024 17:47:57 +0800 Subject: [PATCH 2/2] refactor e2e slow tests --- ci/scripts/slow-e2e-test.sh | 4 ++-- .../slow_tests}/backfill/rate_limit/slow-udf.slt | 0 .../slow_tests}/udf/always_retry_python.slt | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {e2e_test_slow => e2e_test/slow_tests}/backfill/rate_limit/slow-udf.slt (100%) rename {e2e_test_slow => e2e_test/slow_tests}/udf/always_retry_python.slt (100%) diff --git a/ci/scripts/slow-e2e-test.sh b/ci/scripts/slow-e2e-test.sh index 2fa1c977a9cf..dc33c2719053 100755 --- a/ci/scripts/slow-e2e-test.sh +++ b/ci/scripts/slow-e2e-test.sh @@ -36,5 +36,5 @@ echo "--- e2e, $mode, slow-udf-tests" python3 -m pip install --break-system-packages arrow-udf==0.2.1 RUST_LOG="info" \ risedev ci-start "$mode" -sqllogictest -p 4566 -d dev './e2e_test_slow/udf/always_retry_python.slt' -sqllogictest -p 4566 -d dev './e2e_test_slow/backfill/rate_limit/slow-udf.slt' +sqllogictest -p 4566 -d dev './e2e_test/slow_tests/udf/always_retry_python.slt' +sqllogictest -p 4566 -d dev './e2e_test/slow_tests/backfill/rate_limit/slow-udf.slt' diff --git a/e2e_test_slow/backfill/rate_limit/slow-udf.slt b/e2e_test/slow_tests/backfill/rate_limit/slow-udf.slt similarity index 100% rename from e2e_test_slow/backfill/rate_limit/slow-udf.slt rename to e2e_test/slow_tests/backfill/rate_limit/slow-udf.slt diff --git a/e2e_test_slow/udf/always_retry_python.slt b/e2e_test/slow_tests/udf/always_retry_python.slt similarity index 100% rename from e2e_test_slow/udf/always_retry_python.slt rename to e2e_test/slow_tests/udf/always_retry_python.slt