X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fci_management%2Fcleanup_control.sh;fp=scripts%2Fci_management%2Fcleanup_control.sh;h=3f14b0292969abdbd5b1db21db5f520bfc8aaae2;hb=aa2c161a6bb63fb9c2a2b1f8e553f6220919dcf7;hp=574552b84dd55a307a4e4a848bebc3731217aa06;hpb=b9b83e766994a4802b9011ffcba092aa5681c527;p=eliot.git

diff --git a/scripts/ci_management/cleanup_control.sh b/scripts/ci_management/cleanup_control.sh
index 574552b..3f14b02 100755
--- a/scripts/ci_management/cleanup_control.sh
+++ b/scripts/ci_management/cleanup_control.sh
@@ -14,23 +14,29 @@ TESTYAML="testk8s-nginx.yaml"
 
 # start
 
-source ../src/config_kubeedge
+source ../src/config_kubeedge > /dev/null 2>&1
 cd
 kubectl delete -f $TESTYAML
 
-sshpass -p ${EDGENODEPASSWORD} \
-scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge.sh \
-${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+exec_edge_master(){
 
-sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
-source cleanup_edge.sh
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge.sh \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
 
-cd $PATH_OF_ELIOTFOLDER/scripts/ci_management
-source cleanup_master.sh
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
+   source cleanup_edge.sh
 
-sshpass -p ${EDGENODEPASSWORD} \
-scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge_final.sh \
-${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+   cd $PATH_OF_ELIOTFOLDER/scripts/ci_management
+   source cleanup_master.sh
 
-sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
-source cleanup_edge_final.sh
+   sshpass -p ${EDGENODEPASSWORD} \
+   scp ${PATH_OF_ELIOTFOLDER}/scripts/ci_management/cleanup_edge_final.sh \
+   ${EDGENODEUSR}@${EDGENODEIP}:$HOME_EDGENODE
+
+   sshpass -p ${EDGENODEPASSWORD} ssh ${EDGENODEUSR}@${EDGENODEIP} \
+   source cleanup_edge_final.sh
+
+}
+
+exec_edge_master > /dev/null 2>&1