Skip to content

Commit

Permalink
support ssl-hostname-overwrite
Browse files Browse the repository at this point in the history
Signed-off-by: DavidLiu <[email protected]>
  • Loading branch information
David Liu committed Mar 29, 2022
2 parents 3095fb4 + 7d85be3 commit 9a22448
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 11 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ jobs:
- uses: actions/checkout@main
- run: make docker
name: build tape docker
integration-test-1412:
runs-on: ubuntu-latest
needs: unit-test
strategy:
matrix:
FABRIC_VERSION: [1_4]
INTERGATION_CASE: [ANDLogic]
steps:
- uses: actions/checkout@main
- uses: actions/setup-go@main
with:
go-version: 1.16
- run: go mod vendor
- run: make integration-test FABRIC_VERSION=${{matrix.FABRIC_VERSION}} INTERGATION_CASE=${{matrix.INTERGATION_CASE}}
integration-test:
runs-on: ubuntu-latest
needs: unit-test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM golang:1.16 as golang

WORKDIR /root

ENV GOPROXY=https://goproxy.cn,direct
#ENV GOPROXY=https://goproxy.cn,direct
ENV export GOSUMDB=off

COPY . .
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,3 @@ basic-checks: gotools-install linter
linter:
@echo "LINT: Running code checks......"
./scripts/golinter.sh

clean:
cd fabric-samples/first-network; echo y | ./byfn.sh down
rm -rf fabric-samples
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<img src="logo.svg" width="100">
</div>

[![Go doc](https://img.shields.io/badge/go.dev-reference-brightgreen?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/hyperledger-twgc/tape)
[![Github workflow test](https://github.com/Hyperledger-TWGC/tape/actions/workflows/test.yml/badge.svg)](https://github.com/Hyperledger-TWGC/tape/actions/workflows/test.yml)

A light-weight tool to test performance of Hyperledger Fabric

Expand Down
2 changes: 1 addition & 1 deletion pkg/infra/basic/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func Init(service string) (opentracing.Tracer, io.Closer) {
Param: 1,
},
Reporter: &config.ReporterConfig{
LogSpans: true,
LogSpans: false,
},
}
tracer, closer, err := cfg.New(
Expand Down
11 changes: 6 additions & 5 deletions test/integration-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ case $1 in
cd ./first-network

echo y | ./byfn.sh up -i 1.4.12

## 1.4 cryptogen compensate
priv_sk=crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/*
cp $priv_sk crypto-config/peerOrganizations/org1.example.com/users/[email protected]/msp/keystore/priv_sk
##
cp -r crypto-config "$DIR"

CONFIG_FILE=/config/test/config14org1andorg2.yaml
network=host
;;
Expand Down Expand Up @@ -82,8 +87,6 @@ case $1 in
esac

cd "$DIR"
#docker ps -a
#docker network ls
## warm up for the init chaincode block
sleep 10
case $2 in
Expand All @@ -92,8 +95,6 @@ case $2 in
docker run -d --name tape1 -e TAPE_LOGLEVEL=debug --network $network -v $PWD:/config tape tape traffic -c $CONFIG_FILE --rate=10 -n 500
docker run -d --name tape2 -e TAPE_LOGLEVEL=debug --network $network -v $PWD:/config tape tape traffic -c $CONFIG_FILE --rate=10 -n 500
sleep 10
#docker logs tape1
#
timeout 10 docker logs tape3
timeout 10 docker logs tape2
;;
Expand Down

0 comments on commit 9a22448

Please sign in to comment.