fix up CI (#148)

adding COMPOSE_PROJECT_NAME equals to docker adding docker container check after test network up adding docker network check after test network up Signed-off-by: SamYuan1990 <[email protected]>
Hyperledger-TWGC · Feb 6, 2021 · fbc2d5c · fbc2d5c
1 parent d3933be
commit fbc2d5c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/test/config20org1andorg2.yaml b/test/config20org1andorg2.yaml
@@ -1,14 +1,14 @@
 # Definition of nodes
 peer1: &peer1
-  addr: localhost:7051
+  addr: peer0.org1.example.com:7051
   tls_ca_cert: /config/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
 
 peer2: &peer2
-  addr: localhost:9051
+  addr: peer0.org2.example.com:9051
   tls_ca_cert: /config/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
 
 orderer1: &orderer1
-  addr: localhost:7050
+  addr: orderer.example.com:7050
   tls_ca_cert: /config/organizations/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
 
 # Nodes to interact with

diff --git a/test/config20selectendorser.yaml b/test/config20selectendorser.yaml
@@ -1,14 +1,14 @@
 # Definition of nodes
 peer1: &peer1
-  addr: localhost:7051
+  addr: peer0.org1.example.com:7051
   tls_ca_cert: /config/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem
 
 peer2: &peer2
-  addr: localhost:9051
+  addr: peer0.org2.example.com:9051
   tls_ca_cert: /config/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp/tlscacerts/tlsca.org2.example.com-cert.pem
 
 orderer1: &orderer1
-  addr: localhost:7050
+  addr: orderer.example.com:7050
   tls_ca_cert: /config/organizations/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem
 
 # Nodes to interact with

diff --git a/test/integration-test.sh b/test/integration-test.sh
@@ -3,9 +3,12 @@ set -ex
 
 DIR=$PWD
 docker build -t tape:latest .
+network=docker_test
+export COMPOSE_PROJECT_NAME=docker
 
 case $1 in
  1_4)
+    unset COMPOSE_PROJECT_NAME
     # sadly, bootstrap.sh from release-1.4 still pulls binaries from Nexus, which is not available anymore
     curl -vsS https://raw.githubusercontent.com/hyperledger/fabric/release-2.2/scripts/bootstrap.sh | bash
     cd ./fabric-samples/
@@ -19,6 +22,7 @@ case $1 in
     cp -r crypto-config "$DIR"
 
     CONFIG_FILE=/config/test/config14org1andorg2.yaml
+    network=host
     ;;
  2_2)
     curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.2.2 1.4.9
@@ -77,4 +81,6 @@ case $1 in
 esac
 
 cd "$DIR"
-docker run  -e TAPE_LOGLEVEL=debug --network host -v $PWD:/config tape tape -c $CONFIG_FILE -n 500
+docker ps -a
+docker network ls
+docker run  -e TAPE_LOGLEVEL=debug --network $network -v $PWD:/config tape tape -c $CONFIG_FILE -n 500