From 51f76977b0ee102ea7efc17875f2694c42823777 Mon Sep 17 00:00:00 2001
From: Julian Castrence <juliancastrence@ibm.com>
Date: Wed, 27 Jan 2021 10:29:24 -0500
Subject: [PATCH] Rename --channel-id to --channelID in osadmin

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
---
 ci/azure-pipelines.yml                 | 2 +-
 ci/scripts/pullFabricImages.sh         | 2 +-
 ci/scripts/run-test-network-basic.sh   | 2 +-
 ci/scripts/run-test-network-events.sh  | 2 +-
 ci/scripts/run-test-network-ledger.sh  | 2 +-
 ci/scripts/run-test-network-private.sh | 2 +-
 ci/scripts/run-test-network-sbe.sh     | 2 +-
 ci/scripts/run-test-network-secured.sh | 2 +-
 test-network/scripts/createChannel.sh  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index b9695eea..27f8d376 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -7,7 +7,7 @@ trigger:
   - release-1.4
 
 variables:
-  FABRIC_VERSION: 2.3
+  FABRIC_VERSION: 2.4
   GO_BIN: $(Build.Repository.LocalPath)/bin
   GO_VER: 1.14.6
   NODE_VER: 12.x
diff --git a/ci/scripts/pullFabricImages.sh b/ci/scripts/pullFabricImages.sh
index ec31fa62..b27bc281 100755
--- a/ci/scripts/pullFabricImages.sh
+++ b/ci/scripts/pullFabricImages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 STABLE_TAG=amd64-${FABRIC_VERSION}-stable
 
 for image in baseos peer orderer ca tools orderer ccenv javaenv nodeenv tools; do
diff --git a/ci/scripts/run-test-network-basic.sh b/ci/scripts/run-test-network-basic.sh
index a55f5460..285fdb5e 100755
--- a/ci/scripts/run-test-network-basic.sh
+++ b/ci/scripts/run-test-network-basic.sh
@@ -1,6 +1,6 @@
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
 CHAINCODE_NAME=${CHAINCODE_NAME:-basic}
 CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-basic}
diff --git a/ci/scripts/run-test-network-events.sh b/ci/scripts/run-test-network-events.sh
index 8afc3c6a..836d130e 100755
--- a/ci/scripts/run-test-network-events.sh
+++ b/ci/scripts/run-test-network-events.sh
@@ -1,6 +1,6 @@
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-javascript}
 CHAINCODE_NAME=${CHAINCODE_NAME:-events}
 CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-events}
diff --git a/ci/scripts/run-test-network-ledger.sh b/ci/scripts/run-test-network-ledger.sh
index 6065c077..19258bcb 100755
--- a/ci/scripts/run-test-network-ledger.sh
+++ b/ci/scripts/run-test-network-ledger.sh
@@ -1,6 +1,6 @@
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
 CHAINCODE_NAME=${CHAINCODE_NAME:-ledger}
 CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-ledger-queries}
diff --git a/ci/scripts/run-test-network-private.sh b/ci/scripts/run-test-network-private.sh
index d40ab90a..7178bcf5 100755
--- a/ci/scripts/run-test-network-private.sh
+++ b/ci/scripts/run-test-network-private.sh
@@ -1,6 +1,6 @@
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
 CHAINCODE_NAME=${CHAINCODE_NAME:-private}
 CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-private-data}
diff --git a/ci/scripts/run-test-network-sbe.sh b/ci/scripts/run-test-network-sbe.sh
index c4b6014f..434bdcb9 100755
--- a/ci/scripts/run-test-network-sbe.sh
+++ b/ci/scripts/run-test-network-sbe.sh
@@ -1,6 +1,6 @@
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-typescript}
 CHAINCODE_NAME=${CHAINCODE_NAME:-sbe}
 CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-sbe}
diff --git a/ci/scripts/run-test-network-secured.sh b/ci/scripts/run-test-network-secured.sh
index f2c68188..c10eed40 100755
--- a/ci/scripts/run-test-network-secured.sh
+++ b/ci/scripts/run-test-network-secured.sh
@@ -1,6 +1,6 @@
 set -euo pipefail
 
-FABRIC_VERSION=${FABRIC_VERSION:-2.3}
+FABRIC_VERSION=${FABRIC_VERSION:-2.4}
 CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
 CHAINCODE_NAME=${CHAINCODE_NAME:-secured}
 CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-secured-agreement}
diff --git a/test-network/scripts/createChannel.sh b/test-network/scripts/createChannel.sh
index a8e835ef..e4d14f0b 100755
--- a/test-network/scripts/createChannel.sh
+++ b/test-network/scripts/createChannel.sh
@@ -37,7 +37,7 @@ createChannel() {
 	while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ] ; do
 		sleep $DELAY
 		set -x
-		osnadmin channel join --channel-id $CHANNEL_NAME --config-block ./channel-artifacts/${CHANNEL_NAME}.block -o localhost:7053 --ca-file "$ORDERER_CA" --client-cert "$ORDERER_ADMIN_TLS_SIGN_CERT" --client-key "$ORDERER_ADMIN_TLS_PRIVATE_KEY" >&log.txt
+		osnadmin channel join --channelID $CHANNEL_NAME --config-block ./channel-artifacts/${CHANNEL_NAME}.block -o localhost:7053 --ca-file "$ORDERER_CA" --client-cert "$ORDERER_ADMIN_TLS_SIGN_CERT" --client-key "$ORDERER_ADMIN_TLS_PRIVATE_KEY" >&log.txt
 		res=$?
 		{ set +x; } 2>/dev/null
 		let rc=$res