update conditionals (#1112)

Signed-off-by: nkl199@yahoo.co.uk <nkl199@yahoo.co.uk>
hyperledger · Jan 5, 2021 · 6ced65a · 6ced65a
1 parent 6fa9b12
commit 6ced65a
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,12 +1,19 @@
 trigger:
-- main
+  branches:
+    include:
+    - master
 
 pr:
-- master
+  branches:
+    include:
+    - master
 
 pool:
   vmImage: 'ubuntu-latest'
 
+variables:
+- group: credentials
+
 stages:
 - stage: UnitTests
   displayName: Run unit tests
@@ -38,6 +45,7 @@ stages:
 
 - stage: IntegrationTests
   displayName: Run integration tests
+  condition: and(succeeded(), (variables['Build.Reason'], 'PullRequest'))
   dependsOn: UnitTests
   jobs:
   - job: fabricIntegration
@@ -97,7 +105,7 @@ stages:
 
 - stage: Publish
   displayName: Publish Caliper
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.Reason'], 'IndividualCI'))
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
   jobs:
   - job: PublishNPM
     displayName: 'Publish Caliper NPM packages'