Fix build failures (#41)

Signed-off-by: James Taylor <jamest@uk.ibm.com>
hyperledger · Oct 21, 2020 · 188bfec · 188bfec
1 parent ef92fe0
commit 188bfec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -22,11 +22,12 @@ pool:
   vmImage: ubuntu-16.04
 
 steps:
-  - template: install_deps.yml
   - checkout: self
     clean: true
     fetchDepth: 1
 
+  - template: install_deps.yml
+
   - script: .azure-pipelines/scripts/lint.sh
     displayName: Vet and lint
 
@@ -45,8 +46,14 @@ steps:
 
   - script: |
       .azure-pipelines/scripts/setup-integration-chaincode.sh
-      fabric-chaincode-integration run --chaincode-dir .azure-pipelines/resources/chaincode  --language golang --logging-level debug
-    displayName: Run integration tests
+      fabric-chaincode-integration run --chaincode-dir .azure-pipelines/resources/chaincode  --language golang --logging-level debug --tags @single-org
+    displayName: Run single-org integration tests
+
+  # Work around fabric-chaincode-integration issue by running three-org tests separately
+  - script: |
+      .azure-pipelines/scripts/setup-integration-chaincode.sh
+      fabric-chaincode-integration run --chaincode-dir .azure-pipelines/resources/chaincode  --language golang --logging-level debug --tags @three-org
+    displayName: Run three-org integration tests
 
   - script: .azure-pipelines/scripts/release-checks.sh $(Build.SourceBranchName)
     displayName: Release checklist

diff --git a/.azure-pipelines/install_deps.yml b/.azure-pipelines/install_deps.yml
@@ -9,7 +9,7 @@ steps:
       displayName: Install Node
     - script: |
         npm install -g license-check-and-add@3.0.3
-        npm install -g fabric-chaincode-integration@0.4.0-2020330103418
+        npm install -g fabric-chaincode-integration@0.5.0-2020921131117
       displayName: Install NPM Globals
     - task: GoTool@0
       inputs: