Enable builds for PRs that target master branch (#1108)

Signed-off-by: nkl199@yahoo.co.uk <nkl199@yahoo.co.uk>
hyperledger · Jan 4, 2021 · d6f0027 · d6f0027
1 parent bc436e8
commit d6f0027
Showing 1 changed file with 81 additions and 76 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,91 +1,96 @@
 trigger:
 - main
 
+pr:
+- master
+
 pool:
   vmImage: 'ubuntu-latest'
 
-jobs:
-- job: unitTests
-  displayName: 'Base build and unit tests'
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
+stages:
+- stage: UnitTests
+  displayName: Run unit tests
+  jobs:
+  - job: unitTests
+    displayName: 'Base build and unit tests'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
 
-  - script: |
-      ./scripts/check-package-names.sh
-    displayName: 'check package names'
+    - script: |
+        ./scripts/check-package-names.sh
+      displayName: 'check package names'
 
-  - script: |
-      npm install
-      npm run bootstrap
-    displayName: 'npm install, bootstrap'
+    - script: |
+        npm install
+        npm run bootstrap
+      displayName: 'npm install, bootstrap'
 
-  - script: |
-      ./packages/caliper-publish/publish.js version check
-    displayName: 'version check'
+    - script: |
+        ./packages/caliper-publish/publish.js version check
+      displayName: 'version check'
 
-  - script: |
-      npm test
-    displayName: 'unit test'
+    - script: |
+        npm test
+      displayName: 'unit test'
 
-- job: fabricIntegration
-  displayName: 'Fabric Integration Test'
-  dependsOn: unitTests
-  variables: { BENCHMARK: fabric }
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
-  - script: |
-      .build/benchmark-integration-test-direct.sh
+- stage: IntegrationTests
+  displayName: Run integration tests
+  dependsOn: UnitTests
+  jobs:
+  - job: fabricIntegration
+    displayName: 'Fabric Integration Test'
+    variables: { BENCHMARK: fabric }
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - script: |
+        .build/benchmark-integration-test-direct.sh
 
-- job: ethereumIntegration
-  displayName: 'Ethereum Integration Test'
-  dependsOn: unitTests
-  variables: { BENCHMARK: ethereum }
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
-  - script: |
-      .build/benchmark-integration-test-direct.sh
+  - job: ethereumIntegration
+    displayName: 'Ethereum Integration Test'
+    variables: { BENCHMARK: ethereum }
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - script: |
+        .build/benchmark-integration-test-direct.sh
 
-- job: besuIntegration
-  displayName: 'Besu Integration Test'
-  dependsOn: unitTests
-  variables: { BENCHMARK: besu }
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
-  - script: |
-      .build/benchmark-integration-test-direct.sh
+  - job: besuIntegration
+    displayName: 'Besu Integration Test'
+    variables: { BENCHMARK: besu }
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - script: |
+        .build/benchmark-integration-test-direct.sh
 
-- job: fiscoIntegration
-  displayName: 'FISCO BCOS Integration Test'
-  dependsOn: unitTests
-  variables: { BENCHMARK: fisco-bcos }
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
-  - script: |
-      .build/benchmark-integration-test-direct.sh
+  - job: fiscoIntegration
+    displayName: 'FISCO BCOS Integration Test'
+    variables: { BENCHMARK: fisco-bcos }
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - script: |
+        .build/benchmark-integration-test-direct.sh
 
-- job: generatorIntegration
-  displayName: 'Generator Integration Test'
-  dependsOn: unitTests
-  variables: { BENCHMARK: generator }
-  steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '10.x'
-    displayName: 'Install Node.js'
-  - script: |
-      .build/benchmark-integration-test-direct.sh
+  - job: generatorIntegration
+    displayName: 'Generator Integration Test'
+    variables: { BENCHMARK: generator }
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - script: |
+        .build/benchmark-integration-test-direct.sh