Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/fsat-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-network-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-network-bft-orderer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test-network-k8s/docs/BFT_ORDERERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-network/network.config
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test-network/scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:"
Expand Down
Loading