BE-787 Add fabric 1.4.8 / 2.2.0 support (#150)

Update API/GUI test network specs to 1.4.8 and 2.2.0 Signed-off-by: Atsushi Neki <atsushin@fast.au.fujitsu.com>
hyperledger-labs · Jul 24, 2020 · 876ac15 · 876ac15
1 parent f1a40d1
commit 876ac15
Show file tree

Hide file tree

Showing 10 changed files with 178 additions and 140 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,9 @@ _build
 # _static
 _templates
 *.DS_Store
+crypto-config
+**/specs/channel-artifacts
+**/specs/configFiles/
+**/specs/templates/
+**/specs/ytt/
+PTE
diff --git a/app/platform/fabric/e2e-test/runTestSuite.sh b/app/platform/fabric/e2e-test/runTestSuite.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
 ROOTDIR="$(cd "$(dirname "$0")"/../../../.. && pwd)"
-FABRIC_V1_VERSION=1.4.6
-FABRIC_V2_VERSION=2.1.1
+FABRIC_V1_VERSION=1.4.8
+FABRIC_CA_V1_VERSION=1.4.7
+FABRIC_V2_VERSION=2.2.0
+FABRIC_CA_V2_VERSION=1.4.7
 
 echo "#### Downloaded fabric-test repo"
 
@@ -14,14 +16,14 @@ fi
 while getopts "12" opt; do
   case "$opt" in
   1)
-    SDKVER=1.4.8
+    SDKVER=1.4.11
     export FABRIC_VERSION=1
     export RELEASE_VERSION=1.4-stable
     CHECKOUT_HASH=45799a2ee4eefa49ae705cc57ed415270c35d60a
     # export FABRIC_CFG_PATH=$GOPATH/src/github.com/hyperledger/fabric-test/scripts/config
     export PATH=$GOPATH/src/github.com/hyperledger/fabric-test/scripts/bin:$PATH
     PULL_PEER_IMAGE_VERSION=${FABRIC_V1_VERSION}
-    PULL_CA_IMAGE_VERSION=${FABRIC_V1_VERSION}
+    PULL_CA_IMAGE_VERSION=${FABRIC_CA_V1_VERSION}
     ;;
   2)
     SDKVER=2.0.0-beta.2
@@ -30,7 +32,7 @@ while getopts "12" opt; do
     export FABRIC_CFG_PATH=$GOPATH/src/github.com/hyperledger/fabric-test/config
     export PATH=$GOPATH/src/github.com/hyperledger/fabric-test/bin:$PATH
     PULL_PEER_IMAGE_VERSION=${FABRIC_V2_VERSION}
-    PULL_CA_IMAGE_VERSION=${FABRIC_V1_VERSION}
+    PULL_CA_IMAGE_VERSION=${FABRIC_CA_V2_VERSION}
     ;;
   *)
     echo "$0 [-1 | -2]"
@@ -75,8 +77,7 @@ rm -rf wallet logs
 popd
 
 curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/master/scripts/bootstrap.sh | bash -s -- ${PULL_PEER_IMAGE_VERSION} ${PULL_CA_IMAGE_VERSION} 0.4.18 -s -b
-docker pull hyperledger/fabric-ca:${FABRIC_V1_VERSION}
-docker tag hyperledger/fabric-ca:${FABRIC_V1_VERSION} hyperledger/fabric-ca:${FABRIC_V2_VERSION}
+docker tag hyperledger/fabric-ca:${PULL_CA_IMAGE_VERSION} hyperledger/fabric-ca:${PULL_PEER_IMAGE_VERSION}
 
 pushd $ROOTDIR/app/platform/fabric/e2e-test/specs
 

diff --git a/app/platform/fabric/e2e-test/specs/apitest-network-spec-v2.yml b/app/platform/fabric/e2e-test/specs/apitest-network-spec-v2.yml
@@ -4,7 +4,7 @@
 
 ---
 dockerOrg: hyperledger
-dockerTag: 2.1.1
+dockerTag: 2.2.0
 
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb

diff --git a/app/platform/fabric/e2e-test/specs/apitest-network-spec.yml b/app/platform/fabric/e2e-test/specs/apitest-network-spec.yml
@@ -7,7 +7,7 @@
 #! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
 #! Development stream images are pulled from
 #! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
-fabricVersion: 1.4.6
+fabricVersion: 1.4.8
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb
 #! This parameter is used to define fabric logging spec in peers

diff --git a/client/e2e-test/gui-e2e-test-start.sh b/client/e2e-test/gui-e2e-test-start.sh
@@ -8,8 +8,10 @@ TIMEOUT=600
 DELAY=10
 
 ROOTDIR="$(cd "$(dirname "$0")"/../.. && pwd)"
-FABRIC_V1_VERSION=1.4.6
-FABRIC_V2_VERSION=2.1.1
+FABRIC_V1_VERSION=1.4.8
+FABRIC_CA_V1_VERSION=1.4.7
+FABRIC_V2_VERSION=2.2.0
+FABRIC_CA_V2_VERSION=1.4.7
 
 echo "#### Downloaded fabric-test repo"
 
@@ -21,14 +23,14 @@ fi
 while getopts "12" opt; do
   case "$opt" in
   1)
-    SDKVER=1.4.8
+    SDKVER=1.4.11
     export FABRIC_VERSION=1
     export RELEASE_VERSION=1.4-stable
     CHECKOUT_HASH=45799a2ee4eefa49ae705cc57ed415270c35d60a
     # export FABRIC_CFG_PATH=$GOPATH/src/github.com/hyperledger/fabric-test/scripts/config
     export PATH=$GOPATH/src/github.com/hyperledger/fabric-test/scripts/bin:$PATH
     PULL_PEER_IMAGE_VERSION=${FABRIC_V1_VERSION}
-    PULL_CA_IMAGE_VERSION=${FABRIC_V1_VERSION}
+    PULL_CA_IMAGE_VERSION=${FABRIC_CA_V1_VERSION}
     ;;
   2)
     SDKVER=2.0.0-beta.2
@@ -37,7 +39,7 @@ while getopts "12" opt; do
     export FABRIC_CFG_PATH=$GOPATH/src/github.com/hyperledger/fabric-test/config
     export PATH=$GOPATH/src/github.com/hyperledger/fabric-test/bin:$PATH
     PULL_PEER_IMAGE_VERSION=${FABRIC_V2_VERSION}
-    PULL_CA_IMAGE_VERSION=${FABRIC_V1_VERSION}
+    PULL_CA_IMAGE_VERSION=${FABRIC_CA_V2_VERSION}
     ;;
   *)
     echo "$0 [-1 | -2]"
@@ -81,8 +83,7 @@ rm -rf wallet logs
 popd
 
 curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/master/scripts/bootstrap.sh | bash -s -- ${PULL_PEER_IMAGE_VERSION} ${PULL_CA_IMAGE_VERSION} 0.4.18 -s -b
-docker pull hyperledger/fabric-ca:${FABRIC_V1_VERSION}
-docker tag hyperledger/fabric-ca:${FABRIC_V1_VERSION} hyperledger/fabric-ca:${FABRIC_V2_VERSION}
+docker tag hyperledger/fabric-ca:${PULL_CA_IMAGE_VERSION} hyperledger/fabric-ca:${PULL_PEER_IMAGE_VERSION}
 
 #
 # Start selenium standalone server

diff --git a/client/e2e-test/specs/gui-e2e-test-network-spec-v2.yml b/client/e2e-test/specs/gui-e2e-test-network-spec-v2.yml
@@ -8,7 +8,7 @@
 #! Development stream images are pulled from
 #! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
 dockerOrg: hyperledger
-dockerTag: 2.1.1
+dockerTag: 2.2.0
 
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb

diff --git a/client/e2e-test/specs/gui-e2e-test-network-spec.yml b/client/e2e-test/specs/gui-e2e-test-network-spec.yml
@@ -7,7 +7,7 @@
 #! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
 #! Development stream images are pulled from
 #! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
-fabricVersion: 1.4.6
+fabricVersion: 1.4.8
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb
 #! This parameter is used to define fabric logging spec in peers

diff --git a/client/src/FabricVersion.js b/client/src/FabricVersion.js
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // add new version of fabric here
-const Version = ['v2.1', 'v1.4'];
+const Version = ['v2.2', 'v1.4'];
 
 export default Version;