Merge "FAB-263 Enable node sdk tests in Jenkins CI process"

Makefile

@@ -93,6 +93,13 @@ membersrvc-image: build/image/membersrvc/.dummy
 unit-test: peer-image gotools
 	@./scripts/goUnitTests.sh $(DOCKER_TAG) "$(GO_LDFLAGS)"
 
+node-sdk: sdk/node
+
+node-sdk-unit-tests: peer membersrvc
+	cd sdk/node && $(MAKE) unit-tests
+
+unit-tests: unit-test node-sdk-unit-tests
+
 .PHONY: images
 images: $(patsubst %,build/image/%/.dummy, $(IMAGES))
 
@@ -251,11 +258,6 @@ images-clean: $(patsubst %,%-image-clean, $(SUBIMAGES))
 
 images-scrub: $(patsubst %,%-image-clean, $(IMAGES))
 
-node-sdk: sdk/node
-
-node-sdk-unit-tests: peer membersrvc
-	cd sdk/node && $(MAKE) unit-tests
-
 .PHONY: $(SUBDIRS:=-clean)
 $(SUBDIRS:=-clean):
 	cd $(patsubst %-clean,%,$@) && $(MAKE) clean

sdk/node/Makefile

@@ -27,7 +27,9 @@ hfc:
 	mkdir -p ./lib/protos
 	cp ../../protos/*.proto ./lib/protos
 	cp ../../membersrvc/protos/*.proto ./lib/protos
-	npm install && sudo npm install -g typescript && sudo npm install typings --global && typings install
+	npm ls -g | grep 'typings' || sudo npm install -g typings
+	npm ls -g | grep 'typescript' || sudo npm install -g typescript
+	npm install && typings install
 	tsc
 	./makedoc.sh