From 73f1421d1f96be78f987832906b0b8fd071a2e94 Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@gmail.com>
Date: Wed, 17 May 2023 17:51:22 +0800
Subject: [PATCH] ci: prefixed config files wit v/e

---
 scripts/conf-test/old-confs/{ee-v5.0.0.conf => e5.0.0.conf} | 0
 scripts/conf-test/old-confs/{ee-v5.0.1.conf => e5.0.1.conf} | 0
 scripts/conf-test/old-confs/{ee-v5.0.2.conf => e5.0.2.conf} | 0
 scripts/conf-test/old-confs/{ee-v5.0.3.conf => e5.0.3.conf} | 0
 .../conf-test/old-confs/{ce-v5.0.20.conf => v5.0.20.conf}   | 0
 .../conf-test/old-confs/{ce-v5.0.21.conf => v5.0.21.conf}   | 0
 .../conf-test/old-confs/{ce-v5.0.22.conf => v5.0.22.conf}   | 0
 .../conf-test/old-confs/{ce-v5.0.23.conf => v5.0.23.conf}   | 0
 .../conf-test/old-confs/{ce-v5.0.24.conf => v5.0.24.conf}   | 0
 .../conf-test/old-confs/{ce-v5.0.25.conf => v5.0.25.conf}   | 0
 scripts/conf-test/run.sh                                    | 6 +++---
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename scripts/conf-test/old-confs/{ee-v5.0.0.conf => e5.0.0.conf} (100%)
 rename scripts/conf-test/old-confs/{ee-v5.0.1.conf => e5.0.1.conf} (100%)
 rename scripts/conf-test/old-confs/{ee-v5.0.2.conf => e5.0.2.conf} (100%)
 rename scripts/conf-test/old-confs/{ee-v5.0.3.conf => e5.0.3.conf} (100%)
 rename scripts/conf-test/old-confs/{ce-v5.0.20.conf => v5.0.20.conf} (100%)
 rename scripts/conf-test/old-confs/{ce-v5.0.21.conf => v5.0.21.conf} (100%)
 rename scripts/conf-test/old-confs/{ce-v5.0.22.conf => v5.0.22.conf} (100%)
 rename scripts/conf-test/old-confs/{ce-v5.0.23.conf => v5.0.23.conf} (100%)
 rename scripts/conf-test/old-confs/{ce-v5.0.24.conf => v5.0.24.conf} (100%)
 rename scripts/conf-test/old-confs/{ce-v5.0.25.conf => v5.0.25.conf} (100%)

diff --git a/scripts/conf-test/old-confs/ee-v5.0.0.conf b/scripts/conf-test/old-confs/e5.0.0.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ee-v5.0.0.conf
rename to scripts/conf-test/old-confs/e5.0.0.conf
diff --git a/scripts/conf-test/old-confs/ee-v5.0.1.conf b/scripts/conf-test/old-confs/e5.0.1.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ee-v5.0.1.conf
rename to scripts/conf-test/old-confs/e5.0.1.conf
diff --git a/scripts/conf-test/old-confs/ee-v5.0.2.conf b/scripts/conf-test/old-confs/e5.0.2.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ee-v5.0.2.conf
rename to scripts/conf-test/old-confs/e5.0.2.conf
diff --git a/scripts/conf-test/old-confs/ee-v5.0.3.conf b/scripts/conf-test/old-confs/e5.0.3.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ee-v5.0.3.conf
rename to scripts/conf-test/old-confs/e5.0.3.conf
diff --git a/scripts/conf-test/old-confs/ce-v5.0.20.conf b/scripts/conf-test/old-confs/v5.0.20.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ce-v5.0.20.conf
rename to scripts/conf-test/old-confs/v5.0.20.conf
diff --git a/scripts/conf-test/old-confs/ce-v5.0.21.conf b/scripts/conf-test/old-confs/v5.0.21.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ce-v5.0.21.conf
rename to scripts/conf-test/old-confs/v5.0.21.conf
diff --git a/scripts/conf-test/old-confs/ce-v5.0.22.conf b/scripts/conf-test/old-confs/v5.0.22.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ce-v5.0.22.conf
rename to scripts/conf-test/old-confs/v5.0.22.conf
diff --git a/scripts/conf-test/old-confs/ce-v5.0.23.conf b/scripts/conf-test/old-confs/v5.0.23.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ce-v5.0.23.conf
rename to scripts/conf-test/old-confs/v5.0.23.conf
diff --git a/scripts/conf-test/old-confs/ce-v5.0.24.conf b/scripts/conf-test/old-confs/v5.0.24.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ce-v5.0.24.conf
rename to scripts/conf-test/old-confs/v5.0.24.conf
diff --git a/scripts/conf-test/old-confs/ce-v5.0.25.conf b/scripts/conf-test/old-confs/v5.0.25.conf
similarity index 100%
rename from scripts/conf-test/old-confs/ce-v5.0.25.conf
rename to scripts/conf-test/old-confs/v5.0.25.conf
diff --git a/scripts/conf-test/run.sh b/scripts/conf-test/run.sh
index 1fa3b3951..4c2f18615 100755
--- a/scripts/conf-test/run.sh
+++ b/scripts/conf-test/run.sh
@@ -16,12 +16,12 @@ start_emqx_with_conf() {
 MINOR_VSN=$(./pkg-vsn.sh "$PROFILE" | cut -d. -f1,2)
 
 if [ "$PROFILE" = "emqx" ]; then
-  EDITION="ce"
+  PREFIX="v"
 else
-  EDITION="ee"
+  PREFIX="e"
 fi
 
-FILES=$(ls ./scripts/conf-test/old-confs/$EDITION-v"$MINOR_VSN"*)
+FILES=$(ls ./scripts/conf-test/old-confs/$PREFIX"$MINOR_VSN"*)
 
 cp "$EMQX_ROOT"/etc/emqx.conf "$EMQX_ROOT"/etc/emqx.conf.bak
 cleanup() {