fix folder name in test scripts (#578)

oceanbase · Sep 27, 2024 · 3474c5a · 3474c5a
1 parent 0c2fb7e
commit 3474c5a
Show file tree

Hide file tree

Showing 41 changed files with 62 additions and 62 deletions.
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
@@ -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 <<EOF > "$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
@@ -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
@@ -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 <<EOF > "$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
@@ -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 <<EOF > "$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
@@ -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 <<EOF > "$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
@@ -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 <<EOF > "$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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <<EOF > "$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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <<EOF > "$output_file"
 export PASSWORD="$PASSWORD"
 export SUFFIX="$SUFFIX"

diff --git a/...s/case_p4_ResourceModification/check_P4_v221_02_1_not_cause_cluster_scheduling_blocked.sh b/...s/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 <<EOF > "$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
@@ -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 <<EOF > "$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
@@ -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
@@ -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 <<EOF > "$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
@@ -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 <<EOF > "$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
@@ -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 <<EOF > "$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() {