Fix Besu integration test (#1174)

* Change opened RPC WS API names to upper case, lower case names resulted in error. * Remove the custom docker build from the network, use the Besu image directly and set the required parameters on the container. * Fix the Besu version to 21.10.1 * Add some docker container log dumps in case of CI test failure Signed-off-by: Attila Klenik <[email protected]>
hyperledger-caliper · Nov 30, 2021 · c73f5a7 · c73f5a7
1 parent 14bbbcb
commit c73f5a7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/packages/caliper-tests-integration/besu_tests/config/caliper-besu-clique.Dockerfile b/packages/caliper-tests-integration/besu_tests/config/caliper-besu-clique.Dockerfile
diff --git a/packages/caliper-tests-integration/besu_tests/config/docker-compose.yml b/packages/caliper-tests-integration/besu_tests/config/docker-compose.yml
@@ -15,18 +15,30 @@
 version: "3"
 services:
   node:
-    build:
-      context: .
-      dockerfile: caliper-besu-clique.Dockerfile
-    image: caliper-besu-clique
+    image: hyperledger/besu:21.10.1
     container_name: besu_clique
     volumes:
       - ./keys:/root/.ethereum/keystore
       - ./data:/root
       - ./orion:/orion
     ports:
       - 8545-8547:8545-8547
-    command: --min-gas-price 0 --revert-reason-enabled --rpc-ws-enabled --rpc-ws-host 0.0.0.0 --host-whitelist=* --rpc-ws-apis admin,eth,miner,web3,net,priv,eea --graphql-http-enabled --discovery-enabled=false --privacy-enabled=true --privacy-url=http://orion:8888 --privacy-public-key-file=/orion/key/orion.pub
+    entrypoint: 
+    - /opt/besu/bin/besu
+    - --genesis-file=/root/genesis.json
+    - --node-private-key-file=/root/.ethereum/keystore/key
+    command: 
+    - --min-gas-price=0 
+    - --revert-reason-enabled 
+    - --rpc-ws-enabled 
+    - --rpc-ws-host=0.0.0.0 
+    - --host-allowlist=* 
+    - --rpc-ws-apis=ADMIN,ETH,MINER,WEB3,NET,PRIV,EEA 
+    - --graphql-http-enabled
+    - --discovery-enabled=false 
+    - --privacy-enabled=true 
+    - --privacy-url=http://orion:8888 
+    - --privacy-public-key-file=/orion/key/orion.pub
   orion:
     image: "pegasyseng/orion:1.6.0"
     container_name: orion

diff --git a/packages/caliper-tests-integration/besu_tests/run.sh b/packages/caliper-tests-integration/besu_tests/run.sh
@@ -32,7 +32,11 @@ fi
 export CALIPER_PROJECTCONFIG=../caliper.yaml
 
 dispose () {
+    # dump some container information in case of an error before tearing down the network
+    echo "########### Container states and logs"
     docker ps -a
+    docker logs --tail 50 besu_clique
+    echo ""
     ${CALL_METHOD} launch manager --caliper-workspace phase1 --caliper-flow-only-end
 }