From ff599c496a7d805504b6593ff871908697558ab8 Mon Sep 17 00:00:00 2001 From: Tatsuya Sato Date: Mon, 12 May 2025 06:14:05 +0000 Subject: [PATCH] Bump fabric to v2.5.13 and v3.1.1 Signed-off-by: Tatsuya Sato --- .github/actions/fsat-setup/action.yaml | 2 +- .github/actions/test-network-setup/action.yaml | 2 +- .github/workflows/test-network-bft-orderer.yaml | 2 +- .../infrastructure/sample-network/network | 2 +- test-network-k8s/docs/BFT_ORDERERS.md | 8 ++++---- test-network/network.config | 2 +- test-network/scripts/utils.sh | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index 24ecf65f15..07ae3a4445 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -12,7 +12,7 @@ inputs: default: v0.25.3 fabric-version: description: Version of Hyperledger Fabric - default: "2.5.12" + default: "2.5.13" ca-version: description: Version of Hyperledger Fabric CA default: "1.5.15" diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index b218afa323..eab2ce06ed 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -12,7 +12,7 @@ inputs: default: 11.x fabric-version: description: Version of Hyperledger Fabric - default: 2.5.12 + default: 2.5.13 ca-version: description: Version of Hyperledger Fabric CA default: 1.5.15 diff --git a/.github/workflows/test-network-bft-orderer.yaml b/.github/workflows/test-network-bft-orderer.yaml index d96a81a8d0..53b466a893 100644 --- a/.github/workflows/test-network-bft-orderer.yaml +++ b/.github/workflows/test-network-bft-orderer.yaml @@ -38,7 +38,7 @@ jobs: # Note: The default Fabric version for CI is currently the latest LTS (v2.5.x). # To test BFT Orderers, Fabric v3.x is explicitly specified here. with: - fabric-version: 3.1.0 + fabric-version: 3.1.1 - name: Run Test Network with BFT Orderers working-directory: test-network diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network index 2eac75ec70..337ea8d13f 100755 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/network +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/network @@ -33,7 +33,7 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.5.12 +context FABRIC_VERSION 2.5.13 context FABRIC_CA_VERSION 1.5.15 context CLUSTER_RUNTIME kind # or k3s for Rancher diff --git a/test-network-k8s/docs/BFT_ORDERERS.md b/test-network-k8s/docs/BFT_ORDERERS.md index ef9ea002de..fc1d16bd6d 100644 --- a/test-network-k8s/docs/BFT_ORDERERS.md +++ b/test-network-k8s/docs/BFT_ORDERERS.md @@ -9,7 +9,7 @@ In the current `test-network-k8s`, a Fabric network with three orderers managed Since BFT Orderers are supported only in Fabric v3.0 and later, you must specify `3.0` or later for the `TEST_NETWORK_FABRIC_VERSION` environment variable. Additionally, set `TEST_NETWORK_ORDERER_TYPE` to `bft` to start the Fabric network and create a channel with BFT consensus type. For example: ```shell -export TEST_NETWORK_FABRIC_VERSION=3.0 +export TEST_NETWORK_FABRIC_VERSION=3.1 export TEST_NETWORK_ORDERER_TYPE=bft ./network kind @@ -39,11 +39,11 @@ First, run the following command to verify that the environment variables are co ```shell $ ./network -Fabric image versions: Peer (3.0.0), CA (1.5.13) -Fabric binary versions: Peer (3.0.0), CA (1.5.13) +Fabric image versions: Peer (3.1.1), CA (1.5.15) +Fabric binary versions: Peer (3.1.1), CA (1.5.15) --- Fabric Information -Fabric Version : 3.0 +Fabric Version : 3.1 Fabric CA Version : 1.5 Container Registry : hyperledger Network name : test-network diff --git a/test-network/network.config b/test-network/network.config index f4af0ae069..b0867bf81d 100644 --- a/test-network/network.config +++ b/test-network/network.config @@ -1,4 +1,4 @@ -# default image tag, example: "2.5.12". "default" will download the latest. (-i) +# default image tag, example: "2.5.13". "default" will download the latest. (-i) IMAGETAG="default" # default ca image tag, example: "1.5.15". "default" will download the latest. (-cai) diff --git a/test-network/scripts/utils.sh b/test-network/scripts/utils.sh index 1147ab0284..fb515102b9 100755 --- a/test-network/scripts/utils.sh +++ b/test-network/scripts/utils.sh @@ -17,7 +17,7 @@ function printHelp() { println println " Flags:" println " Used with \033[0;32mnetwork.sh prereq\033[0m:" - println " -i FabricVersion (default: '2.5.12')" + println " -i FabricVersion (default: '2.5.13')" println " -cai Fabric CA Version (default: '1.5.15')" println elif [ "$USAGE" == "up" ]; then @@ -159,7 +159,7 @@ function printHelp() { println println " Flags:" println " Used with \033[0;32mnetwork.sh prereq\033[0m" - println " -i FabricVersion (default: '2.5.12')" + println " -i FabricVersion (default: '2.5.13')" println " -cai Fabric CA Version (default: '1.5.15')" println println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:"