From f65eeae92b3cfb98f6d7b01adb4c526f1821de0b Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Mon, 25 Sep 2023 14:23:42 +0200 Subject: [PATCH] Add python upgrade dtests with vnodes patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-18842 --- .build/docker/run-tests.sh | 2 +- .build/run-python-dtests.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.build/docker/run-tests.sh b/.build/docker/run-tests.sh index dda7765972..e18af803e9 100755 --- a/.build/docker/run-tests.sh +++ b/.build/docker/run-tests.sh @@ -121,7 +121,7 @@ case ${target} in "stress-test" | "fqltool-test" | "microbench" | "test-burn" | "long-test" | "cqlsh-test" ) [[ ${mem} -gt $((5 * 1024 * 1024 * 1024 * ${jenkins_executors})) ]] || { echo >&2 "tests require minimum docker memory 6g (per jenkins executor (${jenkins_executors})), found ${mem}"; exit 1; } ;; - "dtest" | "dtest-novnode" | "dtest-offheap" | "dtest-large" | "dtest-large-novnode" | "dtest-upgrade" | "dtest-upgrade-large" ) + "dtest" | "dtest-novnode" | "dtest-offheap" | "dtest-large" | "dtest-large-novnode" | "dtest-upgrade" | "dtest-upgrade-novnode"| "dtest-upgrade-large" | "dtest-upgrade-novnode-large" ) [ -f "${cassandra_dtest_dir}/dtest.py" ] || { echo >&2 "${cassandra_dtest_dir}/dtest.py must exist"; exit 1; } [[ ${mem} -gt $((15 * 1024 * 1024 * 1024 * ${jenkins_executors})) ]] || { echo >&2 "dtests require minimum docker memory 16g (per jenkins executor (${jenkins_executors})), found ${mem}"; exit 1; } test_script="run-python-dtests.sh" diff --git a/.build/run-python-dtests.sh b/.build/run-python-dtests.sh index c43057926d..91b597be1c 100755 --- a/.build/run-python-dtests.sh +++ b/.build/run-python-dtests.sh @@ -123,8 +123,12 @@ elif [ "${DTEST_TARGET}" = "dtest-large-novnode" ]; then DTEST_ARGS="--only-resource-intensive-tests --force-resource-intensive-tests" elif [ "${DTEST_TARGET}" = "dtest-upgrade" ]; then DTEST_ARGS="--use-vnodes --num-tokens=${NUM_TOKENS} --execute-upgrade-tests --execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all" +elif [ "${DTEST_TARGET}" = "dtest-upgrade-novnode" ]; then + DTEST_ARGS="--execute-upgrade-tests --execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all" elif [ "${DTEST_TARGET}" = "dtest-upgrade-large" ]; then DTEST_ARGS="--use-vnodes --num-tokens=${NUM_TOKENS} --execute-upgrade-tests --execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all --only-resource-intensive-tests --force-resource-intensive-tests" +elif [ "${DTEST_TARGET}" = "dtest-upgrade-novnode-large" ]; then + DTEST_ARGS="--execute-upgrade-tests --execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all --only-resource-intensive-tests --force-resource-intensive-tests" else echo "Unknown dtest target: ${DTEST_TARGET}" exit 1