summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author2938893385@qq.com <2938893385@qq.com>2024-05-24 16:58:50 +0800
committerShelley-BaoYue <baoyue2@huawei.com>2024-07-11 17:23:46 +0800
commitcf7f5d11d456f0dcba791705c103cd20d8d034b4 (patch)
tree599e699d6f47f71ac4898baddf9509e65c68fe30
parentMerge pull request #5715 from WillardHu/automated-cherry-pick-of-#5643-upstre... (diff)
downloadkubeedge-cf7f5d11d456f0dcba791705c103cd20d8d034b4.tar.gz
fix keadm init profile in v1.17.0 for keadm_e2e test.
Signed-off-by: 2938893385@qq.com <2938893385@qq.com>
-rwxr-xr-xtests/scripts/keadm_compatibility_e2e.sh2
-rwxr-xr-xtests/scripts/keadm_e2e.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/scripts/keadm_compatibility_e2e.sh b/tests/scripts/keadm_compatibility_e2e.sh
index 71b69bd72..ca1f77ee7 100755
--- a/tests/scripts/keadm_compatibility_e2e.sh
+++ b/tests/scripts/keadm_compatibility_e2e.sh
@@ -77,7 +77,7 @@ function start_kubeedge() {
export MASTER_IP=`kubectl get node test-control-plane -o jsonpath={.status.addresses[0].address}`
export KUBECONFIG=$HOME/.kube/config
docker run --rm kubeedge/installation-package:$IMAGE_TAG cat /usr/local/bin/keadm > /usr/local/bin/keadm && chmod +x /usr/local/bin/keadm
- /usr/local/bin/keadm init --advertise-address=$MASTER_IP --profile version --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force
+ /usr/local/bin/keadm init --advertise-address=$MASTER_IP --kubeedge-version $CLOUD_EDGE_VERSION --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force
# ensure tokensecret is generated
while true; do
diff --git a/tests/scripts/keadm_e2e.sh b/tests/scripts/keadm_e2e.sh
index a34ff890b..c491020b9 100755
--- a/tests/scripts/keadm_e2e.sh
+++ b/tests/scripts/keadm_e2e.sh
@@ -75,7 +75,7 @@ function start_kubeedge() {
export MASTER_IP=`kubectl get node test-control-plane -o jsonpath={.status.addresses[0].address}`
export KUBECONFIG=$HOME/.kube/config
docker run --rm kubeedge/installation-package:$IMAGE_TAG cat /usr/local/bin/keadm > /usr/local/bin/keadm && chmod +x /usr/local/bin/keadm
- /usr/local/bin/keadm init --advertise-address=$MASTER_IP --profile version --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force
+ /usr/local/bin/keadm init --advertise-address=$MASTER_IP --kubeedge-version $KUBEEDGE_VERSION --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force
# ensure tokensecret is generated
while true; do