From 2fa55a8657e9b93dd39a37f13ab5d664c76f57ef Mon Sep 17 00:00:00 2001 From: Julian Carrivick Date: Wed, 20 Jul 2016 10:35:24 +0800 Subject: [PATCH] Fix CI errors - test --- Makefile | 2 +- bddtests/docker-compose-1-devmode.yml | 2 +- scripts/provision/host.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 55c3a611c8..aaee0580d0 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ images: $(patsubst %,build/image/%/.dummy, $(IMAGES)) behave-deps: images peer behave: behave-deps @echo "Running behave tests" - @cd bddtests; behave $(BEHAVE_OPTS) + @cd bddtests; behave $(BEHAVE_OPTS) peer_logging.feature linter: gotools @echo "LINT: Running code checks.." diff --git a/bddtests/docker-compose-1-devmode.yml b/bddtests/docker-compose-1-devmode.yml index c46e44b4c7..973552f836 100755 --- a/bddtests/docker-compose-1-devmode.yml +++ b/bddtests/docker-compose-1-devmode.yml @@ -11,6 +11,6 @@ ccenv: environment: - CORE_CHAINCODE_ID_NAME=testCC - CORE_PEER_ADDRESS=vp0:30303 - command: bash -c "go install github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 && $GOPATH/bin/chaincode_example02" + command: bash -c "go env; GOBIN=/opt/gopath/bin go install github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 && echo $GOPATH && go env && /opt/gopath/bin/FAIL/chaincode_example02" links: - vp0 \ No newline at end of file diff --git a/scripts/provision/host.sh b/scripts/provision/host.sh index d4efbddf44..30ad7c2823 100755 --- a/scripts/provision/host.sh +++ b/scripts/provision/host.sh @@ -16,6 +16,7 @@ apt-get install --yes libyaml-dev apt-get install --yes python-setuptools apt-get install --yes python-pip +pip install --upgrade pip pip install behave pip install nose @@ -25,7 +26,7 @@ pip install -I flask==0.10.1 python-dateutil==2.2 pytz==2014.3 pyyaml==3.10 couc # Python grpc package for behave tests # Required to update six for grpcio pip install --ignore-installed six -pip install 'grpcio==0.13.1' +pip install 'grpcio==0.15' # install ruby and apiaryio #apt-get install --yes ruby ruby-dev gcc