diff --git a/tests/case_p2_Resource/check_P2_v211_01_with_anno.sh b/tests/case_p2_Resource/check_P2_v211_01_with_anno.sh index f25d5a8e4..69daef650 100755 --- a/tests/case_p2_Resource/check_P2_v211_01_with_anno.sh +++ b/tests/case_p2_Resource/check_P2_v211_01_with_anno.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -#source case_p2_v211/env_vars.sh +#source case_p2_Resource/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -175,7 +175,7 @@ check_pvc() { } export_to_file() { - local output_file="case_p2_v211/env_vars.sh" + local output_file="case_p2_Resource/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p2_Resource/check_P2_v211_04_webhook_resource_check.sh b/tests/case_p2_Resource/check_P2_v211_04_webhook_resource_check.sh index 751eb4205..615c41edd 100755 --- a/tests/case_p2_Resource/check_P2_v211_04_webhook_resource_check.sh +++ b/tests/case_p2_Resource/check_P2_v211_04_webhook_resource_check.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p2_v211/env_vars.sh +source case_p2_Resource/env_vars.sh #prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p2_Resource/check_P2_v211_05_extra_opt.sh b/tests/case_p2_Resource/check_P2_v211_05_extra_opt.sh index fbfb3ca7d..41cf8cdc3 100755 --- a/tests/case_p2_Resource/check_P2_v211_05_extra_opt.sh +++ b/tests/case_p2_Resource/check_P2_v211_05_extra_opt.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p2_v211/env_vars.sh +source case_p2_Resource/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -108,7 +108,7 @@ check_parameters() { } export_to_file() { - local output_file="case_p2_v211/env_vars.sh" + local output_file="case_p2_Resource/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p2_Resource/check_P2_v211_06_disk_resources.sh b/tests/case_p2_Resource/check_P2_v211_06_disk_resources.sh index 4c6309a67..735dda061 100755 --- a/tests/case_p2_Resource/check_P2_v211_06_disk_resources.sh +++ b/tests/case_p2_Resource/check_P2_v211_06_disk_resources.sh @@ -4,12 +4,12 @@ source setup.sh source util.sh source env.sh -source case_p2_v211/env_vars.sh +source case_p2_Resource/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { kubectl delete namespace $NAMESPACE - rm -rf case_p2_v211/env_vars.sh + rm -rf case_p2_Resource/env_vars.sh } run() { @@ -96,7 +96,7 @@ check_disk_resources() { } export_to_file() { - local output_file="case_p2_v211/env_vars.sh" + local output_file="case_p2_Resource/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p2_Resource/check_P2_v211_07_tenant_update.sh b/tests/case_p2_Resource/check_P2_v211_07_tenant_update.sh index c629431d6..106264146 100755 --- a/tests/case_p2_Resource/check_P2_v211_07_tenant_update.sh +++ b/tests/case_p2_Resource/check_P2_v211_07_tenant_update.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p2_v211/env_211_vars.sh +source case_p2_Resource/env_211_vars.sh # prepare create related resources to create obcluster prepare() { @@ -46,7 +46,7 @@ prepare() { # clean up delete everything by deleting the entire namespace cleanup() { kubectl delete namespace $NAMESPACE - rm -rf case_p2_v211/env_211_vars.sh + rm -rf case_p2_Resource/env_211_vars.sh } run() { @@ -175,7 +175,7 @@ check_operation() { } export_to_file() { - local output_file="case_p2_v211/env_211_vars.sh" + local output_file="case_p2_Resource/env_211_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_01_standalone.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_01_standalone.sh index efda517f1..9b8d12c54 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_01_standalone.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_01_standalone.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -#source case_p3_v212/env_vars.sh +#source case_p3_AdvancedConfig/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -87,7 +87,7 @@ check_in_obcluster() { export_to_file() { - local output_file="case_p3_v212/env_vars.sh" + local output_file="case_p3_AdvancedConfig/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_02_scaled_up.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_02_scaled_up.sh index f16049e3b..ae785feae 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_02_scaled_up.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_02_scaled_up.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p3_v212/env_vars.sh +source case_p3_AdvancedConfig/env_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_03_single_pvc.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_03_single_pvc.sh index 5e8336d67..dcc109007 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_03_single_pvc.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_03_single_pvc.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p3_v212/env_vars.sh +source case_p3_AdvancedConfig/env_vars.sh # prepare create related resources to create obcluster diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_05_operator_kill.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_05_operator_kill.sh index 308a46c99..f9bb43543 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_05_operator_kill.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_05_operator_kill.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p3_v212/env_vars.sh +source case_p3_AdvancedConfig/env_vars.sh # prepare create related resources to create obcluster prepare() { export OBCLUSTER_NAME_THREE_NODE=testthreenode$SUFFIX diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_06_noStandbyDb_WithstandOb.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_06_noStandbyDb_WithstandOb.sh index 96d1af2b8..9c33022aa 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_06_noStandbyDb_WithstandOb.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_06_noStandbyDb_WithstandOb.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p3_v212/env_vars.sh +source case_p3_AdvancedConfig/env_vars.sh # prepare create related resources to create obcluster prepare() { export OBCLUSTER_NAME_STANDBY=obclusterstandby$SUFFIX diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_07_standbyro_secret.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_07_standbyro_secret.sh index 696597725..8b51c198d 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_07_standbyro_secret.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_07_standbyro_secret.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p3_v212/env_vars.sh +source case_p3_AdvancedConfig/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p3_AdvancedConfig/check_P3_v212_08_cluster_with_sa.sh b/tests/case_p3_AdvancedConfig/check_P3_v212_08_cluster_with_sa.sh index 7b081aadd..2222de31a 100755 --- a/tests/case_p3_AdvancedConfig/check_P3_v212_08_cluster_with_sa.sh +++ b/tests/case_p3_AdvancedConfig/check_P3_v212_08_cluster_with_sa.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p3_v212/env_vars.sh +source case_p3_AdvancedConfig/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -16,7 +16,7 @@ prepare() { # clean up delete everything by deleting the entire namespace cleanup() { kubectl delete namespace $NAMESPACE - rm -rf case_p3_v212/env_vars.sh + rm -rf case_p3_AdvancedConfig/env_vars.sh } run() { diff --git a/tests/case_p4_ResourceModification/check_P4_v220_01_tenant_insufficient.sh b/tests/case_p4_ResourceModification/check_P4_v220_01_tenant_insufficient.sh index 543241465..7407e4a0e 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_01_tenant_insufficient.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_01_tenant_insufficient.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -#source case_p4_v220_and_v211/env_vars.sh +#source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -105,7 +105,7 @@ check_obtenant_not_running() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_vars.sh" + local output_file="case_p4_ResourceModification/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p4_ResourceModification/check_P4_v220_02_Resource_status_reset.sh b/tests/case_p4_ResourceModification/check_P4_v220_02_Resource_status_reset.sh index 189d98b12..2cdb03510 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_02_Resource_status_reset.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_02_Resource_status_reset.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_vars.sh +source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p4_ResourceModification/check_P4_v220_03_Resource_Force_remove.sh b/tests/case_p4_ResourceModification/check_P4_v220_03_Resource_Force_remove.sh index 6a56caa36..4a9a4f2bf 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_03_Resource_Force_remove.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_03_Resource_Force_remove.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_vars.sh +source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p4_ResourceModification/check_P4_v220_04_Resource_task_retry.sh b/tests/case_p4_ResourceModification/check_P4_v220_04_Resource_task_retry.sh index dd55d45b0..885da071b 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_04_Resource_task_retry.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_04_Resource_task_retry.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_vars.sh +source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p4_ResourceModification/check_P4_v220_05_Resource_Skipped_tasks.sh b/tests/case_p4_ResourceModification/check_P4_v220_05_Resource_Skipped_tasks.sh index 4c00332d6..5165aeadf 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_05_Resource_Skipped_tasks.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_05_Resource_Skipped_tasks.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_vars.sh +source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p4_ResourceModification/check_P4_v220_06_PVC_dynamic_expansion.sh b/tests/case_p4_ResourceModification/check_P4_v220_06_PVC_dynamic_expansion.sh index c109d2afe..b508ae7ab 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_06_PVC_dynamic_expansion.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_06_PVC_dynamic_expansion.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_vars.sh +source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p4_ResourceModification/check_P4_v220_07_useService_stableIp.sh b/tests/case_p4_ResourceModification/check_P4_v220_07_useService_stableIp.sh index 344f0769c..4f94b71b5 100755 --- a/tests/case_p4_ResourceModification/check_P4_v220_07_useService_stableIp.sh +++ b/tests/case_p4_ResourceModification/check_P4_v220_07_useService_stableIp.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_vars.sh +source case_p4_ResourceModification/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -14,7 +14,7 @@ prepare() { # clean up delete everything by deleting the entire namespace cleanup() { kubectl delete namespace $NAMESPACE - rm -rf case_p4_v220_and_v211/env_vars.sh + rm -rf case_p4_ResourceModification/env_vars.sh } cleanup_obcluster() { diff --git a/tests/case_p4_ResourceModification/check_P4_v221_01_standby_tenants_across_ns_clusters.sh b/tests/case_p4_ResourceModification/check_P4_v221_01_standby_tenants_across_ns_clusters.sh index 3cbfdd1bf..1ab9c520b 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_01_standby_tenants_across_ns_clusters.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_01_standby_tenants_across_ns_clusters.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { @@ -56,7 +56,7 @@ prepare() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_221_vars.sh" + local output_file="case_p4_ResourceModification/env_221_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p4_ResourceModification/check_P4_v221_02_1_not_cause_cluster_scheduling_blocked.sh b/tests/case_p4_ResourceModification/check_P4_v221_02_1_not_cause_cluster_scheduling_blocked.sh index bf5315a3e..8097dbb41 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_02_1_not_cause_cluster_scheduling_blocked.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_02_1_not_cause_cluster_scheduling_blocked.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { @@ -26,7 +26,7 @@ prepare() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_221_vars.sh" + local output_file="case_p4_ResourceModification/env_221_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p4_ResourceModification/check_P4_v221_02_2_not_cause_tenant_scheduling_blocked.sh b/tests/case_p4_ResourceModification/check_P4_v221_02_2_not_cause_tenant_scheduling_blocked.sh index 2ec922f45..d87ffaa70 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_02_2_not_cause_tenant_scheduling_blocked.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_02_2_not_cause_tenant_scheduling_blocked.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { @@ -29,7 +29,7 @@ prepare() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_221_vars.sh" + local output_file="case_p4_ResourceModification/env_221_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p4_ResourceModification/check_P4_v221_03_operator_fine_grained_config.sh b/tests/case_p4_ResourceModification/check_P4_v221_03_operator_fine_grained_config.sh index ceffc69be..0abdecc2d 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_03_operator_fine_grained_config.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_03_operator_fine_grained_config.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { diff --git a/tests/case_p4_ResourceModification/check_P4_v221_04_backup_Mount_after_startup.sh b/tests/case_p4_ResourceModification/check_P4_v221_04_backup_Mount_after_startup.sh index 77cdd7cbe..08923ea01 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_04_backup_Mount_after_startup.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_04_backup_Mount_after_startup.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { @@ -29,7 +29,7 @@ prepare() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_221_vars.sh" + local output_file="case_p4_ResourceModification/env_221_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p4_ResourceModification/check_P4_v221_06_ignore_deletion_annotations.sh b/tests/case_p4_ResourceModification/check_P4_v221_06_ignore_deletion_annotations.sh index f01a0ef82..b848b1f7c 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_06_ignore_deletion_annotations.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_06_ignore_deletion_annotations.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { @@ -29,7 +29,7 @@ prepare() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_221_vars.sh" + local output_file="case_p4_ResourceModification/env_221_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p4_ResourceModification/check_P4_v221_07_service_mode_checkImage.sh b/tests/case_p4_ResourceModification/check_P4_v221_07_service_mode_checkImage.sh index a9bf63503..1e42dc3a2 100755 --- a/tests/case_p4_ResourceModification/check_P4_v221_07_service_mode_checkImage.sh +++ b/tests/case_p4_ResourceModification/check_P4_v221_07_service_mode_checkImage.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p4_v220_and_v211/env_221_vars.sh +source case_p4_ResourceModification/env_221_vars.sh # prepare create related resources to create obcluster prepare() { @@ -26,7 +26,7 @@ prepare() { } export_to_file() { - local output_file="case_p4_v220_and_v211/env_221_vars.sh" + local output_file="case_p4_ResourceModification/env_221_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" @@ -44,7 +44,7 @@ EOF # clean up delete everything by deleting the entire namespace cleanup() { kubectl delete namespace $NS_DEFAULT $NS_OCEANBASE_TEST - rm -rf case_p4_v220_and_v211/env_221_vars.sh + rm -rf case_p4_ResourceModification/env_221_vars.sh } run() { diff --git a/tests/case_p5_Operations/check_P5_v222_01_copyExpanReduce.sh b/tests/case_p5_Operations/check_P5_v222_01_copyExpanReduce.sh index 1598d365d..f19ba18e4 100755 --- a/tests/case_p5_Operations/check_P5_v222_01_copyExpanReduce.sh +++ b/tests/case_p5_Operations/check_P5_v222_01_copyExpanReduce.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -#source case_p5_v222/env_vars.sh +#source case_p5_Operations/env_vars.sh # prepare create related resources to create obcluster prepare() { @@ -100,7 +100,7 @@ validate() { } export_to_file() { - local output_file="case_p5_v222/env_vars.sh" + local output_file="case_p5_Operations/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p5_Operations/check_P5_v222_02_annotate_pause_schedule.sh b/tests/case_p5_Operations/check_P5_v222_02_annotate_pause_schedule.sh index a1e759435..ed98be7b6 100755 --- a/tests/case_p5_Operations/check_P5_v222_02_annotate_pause_schedule.sh +++ b/tests/case_p5_Operations/check_P5_v222_02_annotate_pause_schedule.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_03_modify_ob_sc.sh b/tests/case_p5_Operations/check_P5_v222_03_modify_ob_sc.sh index 279461495..62be25a99 100755 --- a/tests/case_p5_Operations/check_P5_v222_03_modify_ob_sc.sh +++ b/tests/case_p5_Operations/check_P5_v222_03_modify_ob_sc.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { @@ -19,7 +19,7 @@ prepare() { } export_to_file() { - local output_file="case_p5_v222/env_vars.sh" + local output_file="case_p5_Operations/env_vars.sh" { echo "export LOCAL_PATH_NEW=\"$LOCAL_PATH_NEW\"" } >> "$output_file" diff --git a/tests/case_p5_Operations/check_P5_v222_05_op_modify_sc.sh b/tests/case_p5_Operations/check_P5_v222_05_op_modify_sc.sh index 48d189f3f..2dd303d37 100755 --- a/tests/case_p5_Operations/check_P5_v222_05_op_modify_sc.sh +++ b/tests/case_p5_Operations/check_P5_v222_05_op_modify_sc.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_06_op_add_backup_vol.sh b/tests/case_p5_Operations/check_P5_v222_06_op_add_backup_vol.sh index 86a682507..39d8e4509 100755 --- a/tests/case_p5_Operations/check_P5_v222_06_op_add_backup_vol.sh +++ b/tests/case_p5_Operations/check_P5_v222_06_op_add_backup_vol.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_07_op_del_backup_vol.sh b/tests/case_p5_Operations/check_P5_v222_07_op_del_backup_vol.sh index 5e06af803..35dc92316 100755 --- a/tests/case_p5_Operations/check_P5_v222_07_op_del_backup_vol.sh +++ b/tests/case_p5_Operations/check_P5_v222_07_op_del_backup_vol.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_08_op_add_monitor.sh b/tests/case_p5_Operations/check_P5_v222_08_op_add_monitor.sh index e44a5dc52..3f5ab47f8 100755 --- a/tests/case_p5_Operations/check_P5_v222_08_op_add_monitor.sh +++ b/tests/case_p5_Operations/check_P5_v222_08_op_add_monitor.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_09_op_del_monitor.sh b/tests/case_p5_Operations/check_P5_v222_09_op_del_monitor.sh index 397bdda7d..5f7120364 100755 --- a/tests/case_p5_Operations/check_P5_v222_09_op_del_monitor.sh +++ b/tests/case_p5_Operations/check_P5_v222_09_op_del_monitor.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_10_op_scale_resource.sh b/tests/case_p5_Operations/check_P5_v222_10_op_scale_resource.sh index 637faceba..8d4678bc5 100755 --- a/tests/case_p5_Operations/check_P5_v222_10_op_scale_resource.sh +++ b/tests/case_p5_Operations/check_P5_v222_10_op_scale_resource.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_11_op_restart_observers.sh b/tests/case_p5_Operations/check_P5_v222_11_op_restart_observers.sh index 283fa65f1..014df8da8 100755 --- a/tests/case_p5_Operations/check_P5_v222_11_op_restart_observers.sh +++ b/tests/case_p5_Operations/check_P5_v222_11_op_restart_observers.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_12_op_add_zones.sh b/tests/case_p5_Operations/check_P5_v222_12_op_add_zones.sh index 0d9518bd5..efb0db34d 100755 --- a/tests/case_p5_Operations/check_P5_v222_12_op_add_zones.sh +++ b/tests/case_p5_Operations/check_P5_v222_12_op_add_zones.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_13_op_del_zones.sh b/tests/case_p5_Operations/check_P5_v222_13_op_del_zones.sh index 48cc6f563..277be8b06 100755 --- a/tests/case_p5_Operations/check_P5_v222_13_op_del_zones.sh +++ b/tests/case_p5_Operations/check_P5_v222_13_op_del_zones.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_14_op_add_replicas.sh b/tests/case_p5_Operations/check_P5_v222_14_op_add_replicas.sh index 2966432b3..a8d9d7855 100755 --- a/tests/case_p5_Operations/check_P5_v222_14_op_add_replicas.sh +++ b/tests/case_p5_Operations/check_P5_v222_14_op_add_replicas.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { @@ -122,7 +122,7 @@ check_operation() { } export_to_file() { - local output_file="case_p5_v222/env_vars.sh" + local output_file="case_p5_Operations/env_vars.sh" cat < "$output_file" export PASSWORD="$PASSWORD" export SUFFIX="$SUFFIX" diff --git a/tests/case_p5_Operations/check_P5_v222_15_op_del_replicas.sh b/tests/case_p5_Operations/check_P5_v222_15_op_del_replicas.sh index c8086653c..0b9034577 100755 --- a/tests/case_p5_Operations/check_P5_v222_15_op_del_replicas.sh +++ b/tests/case_p5_Operations/check_P5_v222_15_op_del_replicas.sh @@ -4,7 +4,7 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { diff --git a/tests/case_p5_Operations/check_P5_v222_16_op_set_parameter.sh b/tests/case_p5_Operations/check_P5_v222_16_op_set_parameter.sh index a86db7ce5..f92a88409 100755 --- a/tests/case_p5_Operations/check_P5_v222_16_op_set_parameter.sh +++ b/tests/case_p5_Operations/check_P5_v222_16_op_set_parameter.sh @@ -4,12 +4,12 @@ source setup.sh source util.sh source env.sh -source case_p5_v222/env_vars.sh +source case_p5_Operations/env_vars.sh # clean up delete everything by deleting the entire namespace cleanup() { kubectl delete namespace $NAMESPACE - rm -rf case_p5_v222/env_vars.sh + rm -rf case_p5_Operations/env_vars.sh } cleanClusteroperation() {