support make bluetoothdevice and make bluetoothdevice_imagex

Signed-off-by: zhangjie <iamkadisi@163.com>
Co-Authored-By: Kevin Wang <kevinwzf0126@gmail.com>

15 files changed, 161 insertions, 141 deletions

diff --git a/.travis.yml b/.travis.yml
index 48be9a718..c7ee50e29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,11 +47,9 @@ jobs:
       script:
         - make
         - make bluetoothdevice
-        - make edge_small_build
+        - make smallbuild 
         - make crossbuild
         - make crossbuild GOARM=GOARM7
-        - make crossbuild GOARM=GOARM8
-        - make edgesite_small_build
     - name: "unit test, integration test edge"
       arch: amd64
       before_script:
@@ -91,7 +89,7 @@ jobs:
       script:
         - make
         - make bluetoothdevice
-        - make edge_small_build
+        - make smallbuild
     - name: "unit test"
       arch: arm64
       before_script:
diff --git a/Makefile b/Makefile
index c5c9a3a74..9d9c6d9cc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ BINARIES=cloudcore \
 	edgesite \
 	keadm
 
-COMPONENTS=cloud\
+COMPONENTS=cloud \
 	edge
 
 .EXPORT_ALL_VARIABLES:
@@ -26,13 +26,12 @@ define ALL_HELP_INFO
 #   make all HELP=y
 #   make all WHAT=cloudcore
 endef
-
 .PHONY: all
 ifeq ($(HELP),y)
-all:
+all: clean
 	@echo "$$ALL_HELP_INFO"
 else
-all: verify-golang
+all: verify-golang clean
 	hack/make-rules/build.sh $(WHAT)
 endif
 
@@ -62,8 +61,6 @@ verify-vendor:
 verify-codegen: 
 	bash cloud/hack/verify-codegen.sh
 
-
-
 define TEST_HELP_INFO
 # run golang test case.
 #
@@ -76,7 +73,6 @@ define TEST_HELP_INFO
 #   make test HELP=y
 #   make test WHAT=cloud
 endef
-
 .PHONY: test 
 ifeq ($(HELP),y)
 test:
@@ -90,8 +86,6 @@ LINTS=cloud \
 	edge \
 	keadm \
 	bluetoothdevice
-
-
 define LINT_HELP_INFO
 # run golang lint check.
 #
@@ -104,7 +98,6 @@ define LINT_HELP_INFO
 #   make lint HELP=y
 #   make lint WHAT=cloud
 endef
-
 .PHONY: lint 
 ifeq ($(HELP),y)
 lint:
@@ -139,7 +132,7 @@ integrationtest:
 endif
 
 CROSSBUILD_COMPONENTS=edgecore\
-						edgesite
+	edgesite
 GOARM_VALUES=GOARM7 \
 	GOARM8
 
@@ -150,32 +143,30 @@ define CROSSBUILD_HELP_INFO
 #   WHAT: Component names to be lint check. support: $(CROSSBUILD_COMPONENTS) 
 #         If not specified, "everything" will be cross build.
 #
-#	GOARM: go arm value, now support:$(GOARM_VALUES)
-#			If not specified ,default use GOARM=GOARM8 
+# GOARM: go arm value, now support:$(GOARM_VALUES)
+#        If not specified ,default use GOARM=GOARM8 
 #
 #
 # Example:
 #   make crossbuild 
 #   make crossbuild HELP=y
-#	make crossbuild WHAT=edgecore
-#	make crossbuild WHAT=edgecore GOARM=GOARM7
+#   make crossbuild WHAT=edgecore
+#   make crossbuild WHAT=edgecore GOARM=GOARM7
 #
 endef
-
 .PHONY: crossbuild 
 ifeq ($(HELP),y)
 crossbuild:
 	@echo "$$CROSSBUILD_HELP_INFO"
 else
-crossbuild: 
+crossbuild: clean 
 	hack/make-rules/crossbuild.sh $(WHAT) $(GOARM)
 endif
 
 
 
-SMALLBUILD_COMPONENTS=edgecore\
-						edgesite
-
+SMALLBUILD_COMPONENTS=edgecore \
+	edgesite
 define SMALLBUILD_HELP_INFO
 # small build components.
 #
@@ -187,17 +178,16 @@ define SMALLBUILD_HELP_INFO
 # Example:
 #   make smallbuild 
 #   make smallbuild HELP=y
-#	make smallbuild WHAT=edgecore
-#	make smallbuild WHAT=edgesite
+#   make smallbuild WHAT=edgecore
+#   make smallbuild WHAT=edgesite
 #
 endef
-
 .PHONY: smallbuild 
 ifeq ($(HELP),y)
 smallbuild:
 	@echo "$$SMALLBUILD_HELP_INFO"
 else
-smallbuild: 
+smallbuild: clean
 	hack/make-rules/smallbuild.sh $(WHAT)
 endif
 
@@ -210,7 +200,6 @@ define E2E_HELP_INFO
 #   make e2e HELP=y
 #
 endef
-
 .PHONY: e2e 
 ifeq ($(HELP),y)
 e2e:
@@ -222,8 +211,22 @@ e2e:
 	bash tests/e2e/scripts/execute.sh
 endif
 
-
-####################################
+define CLEAN_HELP_INFO
+# Clean up the output of make.
+#
+# Example:
+#   make clean 
+#   make clean HELP=y
+#
+endef
+.PHONY: clean 
+ifeq ($(HELP),y)
+clean:
+	@echo "$$CLEAN_HELP_INFO"
+else
+clean: 
+	hack/make-rules/clean.sh
+endif
 
 
 QEMU_ARCH ?= x86_64
@@ -264,11 +267,10 @@ edgesiteimage:
 	--build-arg RUN_FROM=${ARCH}/docker:dind \
 	-f build/edgesite/Dockerfile .
 
-
 .PHONY: bluetoothdevice
-bluetoothdevice:
-	make -C mappers/bluetooth_mapper
+bluetoothdevice: clean
+	hack/make-rules/bluetoothdevice.sh
 
 .PHONY: bluetoothdevice_image
-bluetoothdevice_image:
-	make -C mappers/bluetooth_mapper bluetooth_mapper_image
+bluetoothdevice_image:bluetoothdevice
+	docker build -t bluetooth_mapper:v1.0 ./mappers/bluetooth_mapper/
diff --git a/cloud/Makefile b/cloud/Makefile
deleted file mode 100644
index e1b107a0a..000000000
--- a/cloud/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# make cloud part
-
-
-.PHONY: 
-
-default: 
-
-
-# Build and run integration tests.
-#
-# Args:
-#   WHAT: Directory names to test.  All *_test.go files under these
-#     directories will be run.  If not specified, "everything" will be tested.
-#   KUBE_TEST_ARGS: Test case name to test.
-#   GOFLAGS: go flags to be passed like verbose mode etc.
-# Example:
-#   make test-integration
-#   make test-integration GOFLAGS=-v
-#   make test-integration GOFLAGS=-v KUBE_TEST_ARGS="-run ^TestInvalidDeviceModel$"
-#   make test-integration GOFLAGS=-v WHAT=./test/integration/crds/
-.PHONY: test-integration
-test-integration:
-	hack/test-integration.sh
-
-.PHONY: generate-code
-generate-code:
-	./hack/update-codegen.sh
-
diff --git a/edge/Makefile b/edge/Makefile
deleted file mode 100644
index 7fcb33c5f..000000000
--- a/edge/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-.PHONY: clean
-clean:
-	bash -x hack/clean.sh
diff --git a/edge/test/integration/scripts/execute.sh b/edge/test/integration/scripts/execute.sh
index d8a48791f..5bb0ff825 100755
--- a/edge/test/integration/scripts/execute.sh
+++ b/edge/test/integration/scripts/execute.sh
@@ -14,11 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workdir=`pwd`
-cd $workdir
-
 curpath=$PWD
 echo $PWD
+
 VAR_EDGED_DIR="/var/lib/kubeedge"
 if [ ! -d ${VAR_EDGED_DIR} ]; then
   sudo mkdir -p ${VAR_EDGED_DIR} && sudo chown $USER:$USER ${VAR_EDGED_DIR}
@@ -31,7 +29,8 @@ sudo pkill edgecore
 #kill the edgecore process if it exists, wait 2s delay before start the edgecore process.
 sleep 2s
 
-PWD=${curpath}/test/integration
+PWD=${curpath}/edge/test/integration
+
 # create cert files
 $PWD/scripts/generate_cert.sh
 sudo rm -rf $PWD/appdeployment/appdeployment.test
diff --git a/edge/test/integration/utils/test_setup.go b/edge/test/integration/utils/test_setup.go
index 719f954da..ee7f0f3ba 100644
--- a/edge/test/integration/utils/test_setup.go
+++ b/edge/test/integration/utils/test_setup.go
@@ -16,9 +16,9 @@ import (
 const (
 	EdgeCoreConfigFile    = "/tmp/edgecore.yaml"
 	CatEdgeCoreConfigFile = "cat /tmp/edgecore.yaml"
-	RunEdgecore           = "sudo pkill -9 edgecore; cd ${GOPATH}/src/github.com/kubeedge/kubeedge/edge/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &"
+	RunEdgecore           = "sudo pkill -9 edgecore; cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &"
 	CheckEdgecore         = "sudo pgrep edgecore"
-	CatEdgecoreLog        = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/edge/; cat edgecore.log"
+	CatEdgecoreLog        = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat edgecore.log"
 	DBFile                = "/tmp/edgecore/edgecore.db"
 )
 
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 0e75c673b..07e1fe701 100644
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -24,7 +24,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-readonly KUBEEDGE_GO_PACKAGE="github.com/kubeedge/kubeedge"
 YES="y"
 NO="n"
 
@@ -133,7 +132,6 @@ kubeedge::golang::binaries_from_targets() {
 
 kubeedge::check::env() {
   errors=()
-	
   if [ -z $GOPATH ]; then
     errors+="GOPATH environment value not set"
   fi
@@ -192,7 +190,6 @@ IFS=" " read -ra KUBEEDGE_ALL_BINARIES<<< "$(kubeedge::golang::get_all_binares)"
 
 kubeedge::golang::build_binaries() {
   kubeedge::check::env
-	
   local -a targets=()
   local binArg
   for binArg in "$@"; do
@@ -209,32 +206,15 @@ kubeedge::golang::build_binaries() {
   local ldflags
   read -r ldflags <<< "$(kubeedge::version::ldflags)"
 
+  mkdir -p ${KUBEEDGE_OUTPUT_BINPATH}
   for bin in ${binaries[@]}; do
-    echo "buildding $bin"
-    go install -ldflags "$ldflags" $bin
+    echo "building $bin"
+    local name="${bin##*/}"
+    set -x
+    go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} -ldflags "$ldflags" $bin
+    set +x
   done
 
-} 
-
-kubeedge::golang::place_bins() {
-  echo "Placing binaries $@"	
-
-  local -a binaries=()
-  local binArg
-  for binArg in "$@"; do
-    binaries+=("${binArg}")
-  done
-  
-  if [[ ${#binaries[@]} -eq 0 ]]; then
-    binaries=("${KUBEEDGE_ALL_BINARIES[@]}")
-  fi
-
-  mkdir -p ${KUBEEDGE_OUTPUT_BINPATH}
-
-  local name
-  for name in ${binaries[@]}; do
-    mv -f "${GOPATH}/bin/${name}" ${KUBEEDGE_OUTPUT_BINPATH} 
-  done
 }
 
 
@@ -274,7 +254,6 @@ kubeedge::golang::cross_build_place_binaries() {
   kubeedge::check::env
   
   local -a targets=()
-  local -a binariesArray=()
   local goarm=${goarm:-${KUBEEDGE_ALL_CROSS_GOARMS[0]}}
 
   for arg in "$@"; do
@@ -287,14 +266,12 @@ kubeedge::golang::cross_build_place_binaries() {
           exit 1
         fi
         targets+=("$(kubeedge::golang::get_target_by_binary $arg)")
-        binariesArray+=("$arg")
       fi
   done
 
   if [[ ${#targets[@]} -eq 0 ]]; then
     for bin in ${KUBEEDGE_ALL_CROSS_BINARIES[@]}; do
         targets+=("$(kubeedge::golang::get_target_by_binary $bin)")
-        binariesArray+=("$bin")
     done
   fi
   
@@ -309,18 +286,20 @@ kubeedge::golang::cross_build_place_binaries() {
   local ldflags
   read -r ldflags <<< "$(kubeedge::version::ldflags)"
 
+  mkdir -p ${KUBEEDGE_OUTPUT_BINPATH}
   for bin in ${binaries[@]}; do
-    echo "cross buildding $bin"
+    echo "cross buildding $bin GOARM${goarm}"
+    local name="${bin##*/}"
     if [ "${goarm}" == "8" ]; then
-      GOARCH=arm64 GOOS="linux" CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc; go install -ldflags "$ldflags" $bin
+      set -x
+      GOARCH=arm64 GOOS="linux" CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} -ldflags "$ldflags" $bin
+      set +x
     elif [ "${goarm}" == "7" ]; then
-      GOARCH=arm GOOS="linux" GOARM=6 CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc; go install -ldflags "$ldflags" $bin
+      set -x
+      GOARCH=arm GOOS="linux" GOARM=6 CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} -ldflags "$ldflags" $bin
+      set +x
     fi
   done
-
-  for name in ${binariesArray[@]}; do 
-    mv -f "${GOPATH}/bin/${name}" ${KUBEEDGE_OUTPUT_BINPATH} 
-  done
 }
 
 KUBEEDGE_ALL_SMALL_BINARIES=(
@@ -342,7 +321,6 @@ kubeedge::golang::is_small_build_binary() {
 kubeedge::golang::small_build_place_binaries() {
   kubeedge::check::env
   local -a targets=()
-  local -a binariesArray=()
 
   for arg in "$@"; do
     if [ "$(kubeedge::golang::is_small_build_binary ${arg})" == "${NO}" ]; then
@@ -350,13 +328,11 @@ kubeedge::golang::small_build_place_binaries() {
       exit 1
     fi
     targets+=("$(kubeedge::golang::get_target_by_binary $arg)")
-    binariesArray+=("$arg")
   done
 
   if [[ ${#targets[@]} -eq 0 ]]; then
     for bin in ${KUBEEDGE_ALL_SMALL_BINARIES[@]}; do
         targets+=("$(kubeedge::golang::get_target_by_binary $bin)")
-        binariesArray+=("$bin")
     done
   fi
   
@@ -366,14 +342,14 @@ kubeedge::golang::small_build_place_binaries() {
   local ldflags
   read -r ldflags <<< "$(kubeedge::version::ldflags)"
 
+  mkdir -p ${KUBEEDGE_OUTPUT_BINPATH}
   for bin in ${binaries[@]}; do
-    echo "small buildding $bin"
-    go install -ldflags "-w -s -extldflags -static $ldflags" $bin
-  done
-
-  for name in ${binariesArray[@]}; do 
-    upx-ucl -9 ${GOPATH}/bin/edgecore
-    mv -f "${GOPATH}/bin/${name}" ${KUBEEDGE_OUTPUT_BINPATH} 
+    echo "small building $bin"
+    local name="${bin##*/}"
+    set -x
+    go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} -ldflags "-w -s -extldflags -static $ldflags" $bin
+    upx-ucl -9 ${KUBEEDGE_OUTPUT_BINPATH}/${name}
+    set +x
   done
 }
 
@@ -398,7 +374,7 @@ kubeedge::golang::get_edge_test_dirs() {
     local findDirs
     local -a dirArray=()
     cd ${KUBEEDGE_ROOT}
-	findDirs=$(find "./edge/pkg" -name "*_test.go"| xargs -I{} dirname {} | uniq)
+    findDirs=$(find "./edge/pkg" -name "*_test.go"| xargs -I{} dirname {} | uniq)
     dirArray=(${findDirs// /})
     echo "${dirArray[@]}"
   )
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
index b9fb53f3e..8af4d9588 100644
--- a/hack/lib/init.sh
+++ b/hack/lib/init.sh
@@ -20,12 +20,15 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# The root of the build/dist directory
+# The root of the kubeedge
 KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 
 KUBEEDGE_OUTPUT_SUBPATH="${KUBEEDGE_OUTPUT_SUBPATH:-_output/local}"
 KUBEEDGE_OUTPUT="${KUBEEDGE_ROOT}/${KUBEEDGE_OUTPUT_SUBPATH}"
 KUBEEDGE_OUTPUT_BINPATH="${KUBEEDGE_OUTPUT}/bin"
 
+readonly KUBEEDGE_GO_PACKAGE="github.com/kubeedge/kubeedge"
+
 source "${KUBEEDGE_ROOT}/hack/lib/golang.sh"
 source "${KUBEEDGE_ROOT}/hack/lib/lint.sh"
+source "${KUBEEDGE_ROOT}/hack/lib/mapper.sh"
diff --git a/hack/lib/mapper.sh b/hack/lib/mapper.sh
new file mode 100644
index 000000000..1e88f96a5
--- /dev/null
+++ b/hack/lib/mapper.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+###
+#Copyright 2020 The KubeEdge Authors.
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+###
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+kubeedge::mapper::build_bluetoothdevice() {
+  blutooth_binary=${KUBEEDGE_GO_PACKAGE}/mappers/bluetooth_mapper
+  name=bluetooth_mapper
+
+  mkdir -p ${KUBEEDGE_OUTPUT_BINPATH}
+  set -x
+  go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} $blutooth_binary
+  set +x
+}
diff --git a/hack/make-rules/bluetoothdevice.sh b/hack/make-rules/bluetoothdevice.sh
new file mode 100755
index 000000000..b8465fc87
--- /dev/null
+++ b/hack/make-rules/bluetoothdevice.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+###
+#Copyright 2020 The KubeEdge Authors.
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+###
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
+source "${KUBEEDGE_ROOT}/hack/lib/init.sh"
+
+kubeedge::mapper::build_bluetoothdevice
diff --git a/hack/make-rules/build.sh b/hack/make-rules/build.sh
index 63e31e9be..cc230c07e 100755
--- a/hack/make-rules/build.sh
+++ b/hack/make-rules/build.sh
@@ -24,4 +24,3 @@ KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 source "${KUBEEDGE_ROOT}/hack/lib/init.sh"
 
 kubeedge::golang::build_binaries "$@"
-kubeedge::golang::place_bins "$@"
diff --git a/hack/make-rules/clean.sh b/hack/make-rules/clean.sh
new file mode 100755
index 000000000..f800d9547
--- /dev/null
+++ b/hack/make-rules/clean.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+###
+#Copyright 2020 The KubeEdge Authors.
+#
+#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License.
+#You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS,
+#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#See the License for the specific language governing permissions and
+#limitations under the License.
+###
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBEEDGE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
+source "${KUBEEDGE_ROOT}/hack/lib/init.sh"
+
+kubeedge::clean::bin(){
+  rm -rf $KUBEEDGE_OUTPUT_BINPATH/*
+}
+
+kubeedge::clean::bin
diff --git a/keadm/Makefile b/keadm/Makefile
deleted file mode 100644
index 222aa9619..000000000
--- a/keadm/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-.PHONY: clean
-clean:
-	$(RM) keadm
-
diff --git a/mappers/bluetooth_mapper/Makefile b/mappers/bluetooth_mapper/Makefile
deleted file mode 100644
index 9a3ebbcf7..000000000
--- a/mappers/bluetooth_mapper/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# make bluetooth_mapper
-.PHONY: default bluetooth_mapper lint bluetooth_mapper_image
-bluetooth_mapper:
-	go build main.go
-
-
-bluetooth_mapper_image: bluetooth_mapper
-	docker build -t bluetooth_mapper:v1.0 .
diff --git a/tests/e2e/constants/constants.go b/tests/e2e/constants/constants.go
index 3012940e4..d546d130f 100644
--- a/tests/e2e/constants/constants.go
+++ b/tests/e2e/constants/constants.go
@@ -9,17 +9,17 @@ const (
 	CatEdgeCoreConfigFile  = "cat " + EdgeCoreConfigFile
 	CatEdgeSiteConfigFile  = "cat " + EdgeSiteConfigFile
 
-	RunCloudcore = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/cloud/; sudo nohup ./cloudcore --config=" + CloudCoreConfigFile + " > cloudcore.log 2>&1 &"
-	RunEdgecore  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/edge/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &"
-	RunEdgeSite  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/edgesite/; sudo nohup ./edgesite --config=" + EdgeSiteConfigFile + " > edgesite.log 2>&1 &"
+	RunCloudcore = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./cloudcore --config=" + CloudCoreConfigFile + " > cloudcore.log 2>&1 &"
+	RunEdgecore  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &"
+	RunEdgeSite  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; sudo nohup ./edgesite --config=" + EdgeSiteConfigFile + " > edgesite.log 2>&1 &"
 
 	CheckCloudcore = "sudo pgrep cloudcore"
 	CheckEdgecore  = "sudo pgrep edgecore"
 	CheckEdgesite  = "sudo pgrep edgesite"
 
-	CatCloudcoreLog = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/cloud/; cat cloudcore.log"
-	CatEdgecoreLog  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/edge/; cat edgecore.log"
-	CatEdgeSiteLog  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/edgesite/; cat  edgesite.log"
+	CatCloudcoreLog = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat cloudcore.log"
+	CatEdgecoreLog  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat edgecore.log"
+	CatEdgeSiteLog  = "cd ${GOPATH}/src/github.com/kubeedge/kubeedge/_output/local/bin/; cat  edgesite.log"
 
 	AppHandler        = "/api/v1/namespaces/default/pods"
 	NodeHandler       = "/api/v1/nodes"