From eecd0e97100e683dc5c468481439598e641683ca Mon Sep 17 00:00:00 2001 From: shubham-yb Date: Sun, 8 Dec 2024 16:11:35 +0000 Subject: [PATCH] Added uniqueness to ssl tests --- migtests/scripts/live-migration-fallb-run-test.sh | 6 +++++- migtests/scripts/live-migration-fallf-run-test.sh | 6 +++++- migtests/scripts/live-migration-run-test.sh | 6 +++++- migtests/scripts/run-test.sh | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/migtests/scripts/live-migration-fallb-run-test.sh b/migtests/scripts/live-migration-fallb-run-test.sh index 7e1145327..5333d5207 100755 --- a/migtests/scripts/live-migration-fallb-run-test.sh +++ b/migtests/scripts/live-migration-fallb-run-test.sh @@ -19,7 +19,6 @@ export SCRIPTS="${REPO_ROOT}/migtests/scripts" export TESTS_DIR="${REPO_ROOT}/migtests/tests" export TEST_DIR="${TESTS_DIR}/${TEST_NAME}" export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')" -export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_fallb_export-dir"} export QUEUE_SEGMENT_MAX_BYTES=400 export PYTHONPATH="${REPO_ROOT}/migtests/lib" @@ -31,6 +30,11 @@ else source "${TEST_DIR}/env.sh" fi +export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_fallb_export-dir"} +if [ -n "${SOURCE_DB_SSL_MODE}" ]; then + EXPORT_DIR="${EXPORT_DIR}_ssl" +fi + if [ "${SOURCE_DB_TYPE}" = "oracle" ] then source ${SCRIPTS}/${SOURCE_DB_TYPE}/live_env.sh diff --git a/migtests/scripts/live-migration-fallf-run-test.sh b/migtests/scripts/live-migration-fallf-run-test.sh index 9d58241e4..d11f41ce7 100755 --- a/migtests/scripts/live-migration-fallf-run-test.sh +++ b/migtests/scripts/live-migration-fallf-run-test.sh @@ -19,7 +19,6 @@ export SCRIPTS="${REPO_ROOT}/migtests/scripts" export TESTS_DIR="${REPO_ROOT}/migtests/tests" export TEST_DIR="${TESTS_DIR}/${TEST_NAME}" export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')" -export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_fallf_export-dir"} export PYTHONPATH="${REPO_ROOT}/migtests/lib" export PATH="${PATH}:/usr/lib/oracle/21/client64/bin" @@ -32,6 +31,11 @@ else source "${TEST_DIR}/env.sh" fi +export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_fallf_export-dir"} +if [ -n "${SOURCE_DB_SSL_MODE}" ]; then + EXPORT_DIR="${EXPORT_DIR}_ssl" +fi + if [ "${SOURCE_DB_TYPE}" = "oracle" ] then source ${SCRIPTS}/${SOURCE_DB_TYPE}/live_env.sh diff --git a/migtests/scripts/live-migration-run-test.sh b/migtests/scripts/live-migration-run-test.sh index 509d16710..b1b24550c 100755 --- a/migtests/scripts/live-migration-run-test.sh +++ b/migtests/scripts/live-migration-run-test.sh @@ -19,7 +19,6 @@ export SCRIPTS="${REPO_ROOT}/migtests/scripts" export TESTS_DIR="${REPO_ROOT}/migtests/tests" export TEST_DIR="${TESTS_DIR}/${TEST_NAME}" export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')" -export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_live_export-dir"} export QUEUE_SEGMENT_MAX_BYTES=400 export PYTHONPATH="${REPO_ROOT}/migtests/lib" @@ -38,6 +37,11 @@ else source ${SCRIPTS}/${SOURCE_DB_TYPE}/env.sh fi +export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_live_export-dir"} +if [ -n "${SOURCE_DB_SSL_MODE}" ]; then + EXPORT_DIR="${EXPORT_DIR}_ssl" +fi + if [[ "${SOURCE_DB_TYPE}" == "postgresql" || "${SOURCE_DB_TYPE}" == "mysql" ]]; then export SOURCE_DB_NAME=${SOURCE_DB_NAME:-"${NORMALIZED_TEST_NAME}_live"} elif [[ "${SOURCE_DB_TYPE}" == "oracle" ]]; then diff --git a/migtests/scripts/run-test.sh b/migtests/scripts/run-test.sh index 12c7a6661..9f0f4a783 100755 --- a/migtests/scripts/run-test.sh +++ b/migtests/scripts/run-test.sh @@ -18,7 +18,6 @@ export SCRIPTS="${REPO_ROOT}/migtests/scripts" export TESTS_DIR="${REPO_ROOT}/migtests/tests" export TEST_DIR="${TESTS_DIR}/${TEST_NAME}" export NORMALIZED_TEST_NAME="$(echo "$TEST_NAME" | tr '/-' '_')" -export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_offline_export-dir"} export PYTHONPATH="${REPO_ROOT}/migtests/lib" @@ -37,6 +36,10 @@ fi source ${SCRIPTS}/${SOURCE_DB_TYPE}/env.sh +export EXPORT_DIR=${EXPORT_DIR:-"${TEST_DIR}/${NORMALIZED_TEST_NAME}_offline_export-dir"} +if [ -n "${SOURCE_DB_SSL_MODE}" ]; then + EXPORT_DIR="${EXPORT_DIR}_ssl" +fi if [[ "${SOURCE_DB_TYPE}" == "postgresql" || "${SOURCE_DB_TYPE}" == "mysql" ]]; then export SOURCE_DB_NAME=${SOURCE_DB_NAME:-"${NORMALIZED_TEST_NAME}_offline"}