X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fsrc%2Fkubeedge_setup.sh;h=c4f72dc7ea9581d03022bc5ae925ff9e717c87b7;hb=refs%2Fchanges%2F86%2F886%2F1;hp=5ed278a1d7f584976ec5e25a6a9645a563fee74c;hpb=2a77f06135eb14b0ffeb7466f118120cddb8336b;p=eliot.git

diff --git a/scripts/src/kubeedge_setup.sh b/scripts/src/kubeedge_setup.sh
index 5ed278a..c4f72dc 100755
--- a/scripts/src/kubeedge_setup.sh
+++ b/scripts/src/kubeedge_setup.sh
@@ -17,7 +17,10 @@ take_keedge(){
 }
 
 source config_kubeedge
-common_steps="sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
+common_steps="echo $GOPATH && \
+echo $HOME && \
+echo $(whoami) && \
+sudo git clone https://github.com/kubeedge/kubeedge.git $GOPATH/src/github.com/kubeedge/kubeedge && \
 source ~/.profile && \
 cd $GOPATH/src && \
 sudo chmod -R 777 github.com && \
@@ -38,18 +41,27 @@ execute_keedge_controller(){
 }
 
 exec_edge(){
+echo $(whoami)
+echo =========
+echo $(pwd)
+echo ========
+echo $GOPATH
+echo ========
+echo $HOME
+
 user_check="jenkins"
-   if [ $(whoami) == $user_check ];then
-      cd $HOME/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src
-   else
-      cd $HOME/eliot/scripts/src
-   fi
-
-   if [ $(whoami) == $user_check ];then
-      sshpass -p ${edgenodepassword} scp $HOME/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:$HOME
-   else
-      sshpass -p ${edgenodepassword} scp $HOME/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
-   fi
+home_path="/home/jenkins"
+   #if [ $HOME == $home_path ];then
+   cd /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src
+   #else
+   #   cd $HOME/eliot/scripts/src
+   #fi
+
+   #if [ $HOME == $home_path ];then
+   sshpass -p ${edgenodepassword} scp /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
+   #else
+   #   sshpass -p ${edgenodepassword} scp $HOME/eliot/scripts/src/config_kubeedge ${edgenodeusr}@${edgenodeip}:/root
+   #fi
 
    sshpass -p ${edgenodepassword} ssh ${edgenodeusr}@${edgenodeip} \
    source config_kubeedge
@@ -78,16 +90,16 @@ execute_keedge_controller
 exec_edge
 sudo kubectl get nodes
 
-user_chec="jenkins"
+#user_chec="jenkins"
 
-if [ $(whoami) == $user_chec ];then
+#if [ $(whoami) == $user_chec ];then
 
-  chmod +x $HOME/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
-  source $HOME/work/workpsace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
+chmod +x /home/jenkins/work/workspace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
+source /home/jenkins/work/workpsace/eliot-deploy-kubeedge-virtual-daily-master/scripts/verifyk8s.sh
 
-else
+#else
 
-  chmod +x $HOME/eliot/scripts/verifyk8s.sh
-  source $HOME/eliot/scripts/verifyk8s.sh
+#  chmod +x $HOME/eliot/scripts/verifyk8s.sh
+#  source $HOME/eliot/scripts/verifyk8s.sh
 
-fi
+#fi