fix e2e tests

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

Makefile

@@ -200,11 +200,11 @@ build-tar: ./bin/node-problem-detector ./bin/log-counter ./test/bin/problem-make
 	sha1sum $(TARBALL)
 	md5sum $(TARBALL)
 
-build-tar-all:
+build-tar-all: clean
 	@for arch in $(ALL_ARCH); do $(MAKE) ARCH=$${arch} build-in-docker; done
-	cp bin/node-problem-detector-amd64 bin/node-problem-detector
-	cp bin/log-counter-amd64 bin/log-counter
-	tar -zcvf $(TARBALL-ALL) bin/ config/ test/e2e-install.sh 
+	@for arch in $(ALL_ARCH); do cp bin/node-problem-detector-$(ARCH) bin/node-problem-detector; done
+	@for arch in $(ALL_ARCH); do cp bin/log-counter-$(ARCH) bin/log-counter; done
+	tar -zcvf $(TARBALL-ALL) bin/ config/ test/e2e-install.sh
 	sha1sum $(TARBALL-ALL)
 	md5sum $(TARBALL-ALL)
 
@@ -215,7 +215,7 @@ build: build-container build-tar
 docker-builder:
 	docker build -t npd-builder ./builder
 
-build-in-docker: clean docker-builder
+build-in-docker: docker-builder
 	docker run \
 		-e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) -e GOCACHE=/go/.cache/go-build \
 		-u $(shell id -u ${USER}):$(shell id -g ${USER}) \

test/e2e-install.sh

@@ -55,10 +55,10 @@ function install-npd() {
   mount -o remount,exec "${BIN_DIR}"
 
   echo "Installing NPD binary."
-  cp "${workdir}"/bin/node-problem-detector "${BIN_DIR}"
+  cp "${workdir}"/bin/node-problem-detector-amd64 "${BIN_DIR}"/node-problem-detector
 
   echo "Installing log-counter binary."
-  cp "${workdir}"/bin/log-counter "${BIN_DIR}"
+  cp "${workdir}"/bin/log-counter-amd64 "${BIN_DIR}"/log-counter
 
   echo "Installing NPD configurations."
   mkdir -p "${CONFIG_DIR}"
@@ -97,4 +97,4 @@ done
 shift "$((OPTIND-1))"
 
 
-main "${@}"
+main "${@}"