Merge pull request #866 from nklincoln/1.4.8-binding

0.3.2 release candidate: Add 1.4.8 binding
hyperledger-caliper · Jun 11, 2020 · 6f00f01 · 6f00f01
2 parents c9de977 + 34d1bee
commit 6f00f01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/caliper-cli/lib/lib/config.yaml b/packages/caliper-cli/lib/lib/config.yaml
@@ -58,8 +58,10 @@ sut:
             packages: ['fabric-client@1.4.5', 'fabric-protos@2.0.0-snapshot.1', 'fabric-network@1.4.5']
         1.4.6:
             packages: ['fabric-client@1.4.6', 'fabric-protos@2.0.0-snapshot.1', 'fabric-network@1.4.6']
-        1.4.7: &fabric-latest
+        1.4.7:
             packages: ['fabric-client@1.4.7', 'fabric-protos@2.0.0-snapshot.1', 'fabric-network@1.4.7']
+        1.4.8: &fabric-latest
+            packages: ['fabric-client@1.4.8', 'fabric-protos@2.0.0-snapshot.1', 'fabric-network@1.4.8']
         2.1.0: &fabric-latest-v2
             packages: ['fabric-common@2.1.0', 'fabric-protos@2.1.0', 'fabric-network@2.1.0', 'fabric-ca-client@2.1.0']
         latest: *fabric-latest

diff --git a/packages/caliper-tests-integration/fabric_tests/run.sh b/packages/caliper-tests-integration/fabric_tests/run.sh
@@ -30,7 +30,7 @@ cd ${DIR}
 # bind during CI tests, using the package dir as CWD
 # Note: do not use env variables for binding settings, as subsequent launch calls will pick them up and bind again
 if [[ "${BIND_IN_PACKAGE_DIR}" = "true" ]]; then
-    ${CALL_METHOD} bind --caliper-bind-sut fabric:1.4.7 --caliper-bind-cwd ./../../caliper-fabric/ --caliper-bind-args="--save-dev"
+    ${CALL_METHOD} bind --caliper-bind-sut fabric:1.4.8 --caliper-bind-cwd ./../../caliper-fabric/ --caliper-bind-args="--save-dev"
 fi
 
 # change default settings (add config paths too)
@@ -95,10 +95,10 @@ if [[ ${rc} != 0 ]]; then
     exit ${rc};
 fi
 
-# UNBIND 1.4.7 SDK, using the package dir as CWD
+# UNBIND SDK, using the package dir as CWD
 # Note: do not use env variables for unbinding settings, as subsequent launch calls will pick them up and bind again
 if [[ "${BIND_IN_PACKAGE_DIR}" = "true" ]]; then
-    ${CALL_METHOD} unbind --caliper-bind-sut fabric:1.4.7 --caliper-bind-cwd ./../../caliper-fabric/ --caliper-bind-args="--save-dev" --caliper-projectconfig ./caliper.yaml
+    ${CALL_METHOD} unbind --caliper-bind-sut fabric:1.4.8 --caliper-bind-cwd ./../../caliper-fabric/ --caliper-bind-args="--save-dev" --caliper-projectconfig ./caliper.yaml
 fi
 # BIND with 2.1.0 SDK, using the package dir as CWD
 # Note: do not use env variables for unbinding settings, as subsequent launch calls will pick them up and bind again