Merge remote-tracking branch 'upstream/stpfiste/manual-runtime-stagin…

…g' into stpfiste/manual-runtime-staging
dotnet · Nov 11, 2021 · 3ebaa8c · 3ebaa8c
2 parents d5c6207 + 4f19def
commit 3ebaa8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
@@ -16,9 +16,9 @@ variables:
 - name: isNotFullMatrix
   value: ${{ and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}
 - name: isSmokeTestBuild
-  value: ${{ or(in(variables['Build.DefinitionName'], 'manual-runtime-staging', 'manual-runtime-staging'), variables['isFullMatrix']) }}
+  value: ${{ or(in(variables['Build.DefinitionName'], 'manual-runtime-staging', 'manual-runtime'), and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'))) }}
 - name: isNotSmokeTestBuild
-  value: ${{ and(not(in(variables['Build.DefinitionName'], 'manual-runtime-staging', 'manual-runtime')), not(variables['isFullMatrix'])) }}
+  value: ${{ and(not(in(variables['Build.DefinitionName'], 'manual-runtime-staging', 'manual-runtime')), eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}
 
 # We only run evaluate paths on runtime, runtime-staging and runtime-community pipelines on PRs
 # keep in sync with /eng/pipelines/common/xplat-setup.yml