Skip to content

Commit

Permalink
FAB-263 Enable node sdk tests in Jenkins CI process
Browse files Browse the repository at this point in the history
Added logic to run node sdk tests in jenkins. Jenkins doesn't support sudo
so, checking whether required softwares installed in machine, if installed
skipping the installation step.

Change-Id: I07d4e68c95b5c8801fb11b156c649ad5d561873b
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
  • Loading branch information
rameshthoomu committed Aug 31, 2016
1 parent 5925f57 commit 82f5225
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion sdk/node/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 82f5225

Please sign in to comment.