Add support for node 16 (#1223)

Signed-off-by: D <d_kelsey@uk.ibm.com> Co-authored-by: D <d_kelsey@uk.ibm.com>
hyperledger-caliper · Feb 18, 2022 · 986c856 · 986c856
1 parent 5922238
commit 986c856
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,17 +13,25 @@ pool:
 
 variables:
   - group: credentials
+  - name: NODEVER
+    value: 14.x
 
 stages:
   - stage: UnitTests
     displayName: Run unit tests
     jobs:
       - job: unitTests
         displayName: "Base build and unit tests"
+        strategy:
+          matrix:
+            Node14:
+              NODEVER: 14.x
+            Node16:
+              NODEVER: 16.x
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: |
               ./scripts/check-package-names.sh
@@ -46,55 +54,85 @@ stages:
     jobs:
       - job: fabricIntegration
         displayName: "Fabric Integration Test"
+        strategy:
+          matrix:
+            Node14:
+              NODEVER: 14.x
+            Node16:
+              NODEVER: 16.x
         variables: { BENCHMARK: fabric }
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: |
               .build/benchmark-integration-test-direct.sh
 
       - job: ethereumIntegration
         displayName: "Ethereum Integration Test"
+        strategy:
+          matrix:
+            Node14:
+              NODEVER: 14.x
+            Node16:
+              NODEVER: 16.x
         variables: { BENCHMARK: ethereum }
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: |
               .build/benchmark-integration-test-direct.sh
 
       - job: besuIntegration
         displayName: "Besu Integration Test"
+        strategy:
+          matrix:
+            Node14:
+              NODEVER: 14.x
+            Node16:
+              NODEVER: 16.x
         variables: { BENCHMARK: besu }
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: |
               .build/benchmark-integration-test-direct.sh
 
       - job: fiscoIntegration
         displayName: "FISCO BCOS Integration Test"
+        strategy:
+          matrix:
+            Node14:
+              NODEVER: 14.x
+            Node16:
+              NODEVER: 16.x
         variables: { BENCHMARK: fisco-bcos }
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: |
               .build/benchmark-integration-test-direct.sh
 
       - job: generatorIntegration
         displayName: "Generator Integration Test"
+        strategy:
+          matrix:
+            Node14:
+              NODEVER: 14.x
+            Node16:
+              NODEVER: 16.x
         variables: { BENCHMARK: generator }
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: |
               .build/benchmark-integration-test-direct.sh
@@ -109,7 +147,7 @@ stages:
         steps:
           - task: NodeTool@0
             inputs:
-              versionSpec: "14.x"
+              versionSpec: "$(NODEVER)"
             displayName: "Install Node.js"
           - script: .build/publish-caliper.sh
             displayName: Publish Caliper

diff --git a/packages/caliper-core/test/common/utils/caliper-utils.js b/packages/caliper-core/test/common/utils/caliper-utils.js
@@ -42,7 +42,7 @@ describe('caliper utilities', () => {
                 ConfigUtil.set(ConfigUtil.keys.Auth[Constants.AuthComponents.PushGateway].UserName, 'penguin');
                 ConfigUtil.set(ConfigUtil.keys.Auth[Constants.AuthComponents.PushGateway].Password, 'madagascar');
                 CaliperUtils.augmentUrlWithBasicAuth('badUrl', Constants.AuthComponents.PushGateway);
-            }).should.throw('Invalid URL: badUrl');
+            }).should.throw(/Invalid URL/);
         });
 
         it('should augment a valid http URL with basic auth', () => {

diff --git a/packages/caliper-gui-dashboard/package.json b/packages/caliper-gui-dashboard/package.json
@@ -38,7 +38,7 @@
         "history": "4.10.1",
         "js-yaml": "^3.13.1",
         "mime-types": "^2.1.24",
-        "node-sass": "4.13.1",
+        "node-sass": "7.0.1",
         "patternomaly": "^1.3.2",
         "perfect-scrollbar": "1.5.0",
         "react": "^16.12.0",