From d707746030d41e8286c8a4e26c9160c56cc1ba2b Mon Sep 17 00:00:00 2001 From: fraVlaca Date: Thu, 14 Jul 2022 18:24:32 +0100 Subject: [PATCH 1/2] fixed nodeenv image used in fvtest to be the one built locally Signed-off-by: fraVlaca --- ci/azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 254c854c..d2dbcb5b 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -147,6 +147,7 @@ stages: set -ev ./tools/getEdgeDocker.sh # essential to get main docker images of peer etc. docker image load --input build/fabric-nodeenv.tar.gz # gets the build image of nodeenv + docker tag hyperledger/fabric-nodeenv:latest hyperledger/fabric-nodeenv:$(FABRIC_VERSION) docker images node common/scripts/install-run-rush.js install node common/scripts/install-run-rush.js update # should the tests need 'building' this will need to go here From 3b81eae0033f8dcdeb5c210003aa5a855c4c0caa Mon Sep 17 00:00:00 2001 From: Dave Enyeart Date: Thu, 22 Sep 2022 06:00:03 -0400 Subject: [PATCH 2/2] Update release-2.4 to use Fabric v2.4.6 (#347) Fix test failure related to the use of 2.4.0-beta. 2.4.0-beta did not have calculatepackageid implemented, which fabric-samples now uses. Ideally tests should not depend on fabric-samples. Signed-off-by: David Enyeart Signed-off-by: David Enyeart --- common/config/rush/command-line.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json index e7c122ec..8fcb3a0f 100644 --- a/common/config/rush/command-line.json +++ b/common/config/rush/command-line.json @@ -25,7 +25,7 @@ "description": "Runs the Scenario e2e tests.", "enableParallelism": true, "ignoreMissingScript": true - }, + }, { "commandKind": "global", "name": "update-protos", @@ -60,7 +60,7 @@ "name": "start-fabric", "summary": "Starts local Fabric test network ", "description": "Run this command to start local Fabric network for testing", - "shellCommand": "rm -rf ./fabric-samples && curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.4.0-beta 1.5.1 && cd ./fabric-samples/test-network && ./network.sh down && ./network.sh up createChannel -ca -s couchdb && cd -" + "shellCommand": "rm -rf ./fabric-samples && curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.4.6 1.5.5 && cd ./fabric-samples/test-network && ./network.sh down && ./network.sh up createChannel -ca -s couchdb && cd -" }, { "commandKind": "global",