reslove for #144 and upgrade 1.4 to 1.4.10

Signed-off-by: SamYuan1990 <yy19902439@126.com>
Hyperledger-TWGC · Feb 1, 2021 · d3933be · d3933be
1 parent e39704c
commit d3933be
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -44,7 +44,12 @@ jobs:
     - dockerbuild
     strategy:
       matrix:
-      # as temp solution, upgrade fabric 2.x version to 2.3
+        FABRIC_2_2:
+          FABRIC_VERSION: '2_2'
+          INTERGATION_CASE: 'ANDLogic'
+        FABRIC_2_2_ORLogic:
+          FABRIC_VERSION: '2_2'
+          INTERGATION_CASE: 'ORLogic'
         FABRIC_2_3:
           FABRIC_VERSION: '2_3'
           INTERGATION_CASE: 'ANDLogic'

diff --git a/test/integration-test.sh b/test/integration-test.sh
@@ -11,14 +11,31 @@ case $1 in
     cd ./fabric-samples/
     git checkout release-1.4
     cd ./first-network
-    echo y | ./byfn.sh up -i 1.4.8
+    # 1.4.10
+    echo y | ./byfn.sh up -i 1.4.10
     # comments here for 1.4.8 work around as docker image issue.
     # docker pull hyperledger/fabric-orderer:amd64-1.4  
     # Error response from daemon: manifest for hyperledger/fabric-orderer:amd64-1.4 not found: manifest unknown: manifest unknown
     cp -r crypto-config "$DIR"
 
     CONFIG_FILE=/config/test/config14org1andorg2.yaml
     ;;
+ 2_2)
+    curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.2.2 1.4.9
+    cd ./fabric-samples/test-network
+    echo y |  ./network.sh down -i 2.2
+    echo y |  ./network.sh up createChannel -i 2.2
+    cp -r organizations "$DIR"
+
+    CONFIG_FILE=/config/test/config20org1andorg2.yaml
+
+    if [ $2 == "ORLogic" ]; then
+      CONFIG_FILE=/config/test/config20selectendorser.yaml
+      ARGS=(-ccep "OR('Org1.member','Org2.member')")
+    fi
+
+    echo y |  ./network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-go/ -ccl go "${ARGS[@]}"
+    ;;
  2_3)
     curl -vsS https://raw.githubusercontent.com/hyperledger/fabric/release-2.3/scripts/bootstrap.sh | bash
     cd ./fabric-samples/test-network
@@ -52,9 +69,9 @@ case $1 in
     echo y |  ./network.sh deployCC -ccn basic -ccp ../asset-transfer-basic/chaincode-go/ -ccl go "${ARGS[@]}"
     ;;
  *)
-    echo "Usage: $1 [1_4|2_3|latest]"
+    echo "Usage: $1 [1_4|2_2|2_3|latest]"
     echo "When given version, start byfn or test network basing on specific version of docker image"
-    echo "For any value without mock, 1_4, 2_3, latest will show this hint"
+    echo "For any value without mock, 1_4, 2_2, 2_3, latest will show this hint"
     exit 0
     ;;
 esac