summaryrefslogtreecommitdiff
path: root/buildpipeline/tests
diff options
context:
space:
mode:
authorRuss Keldorph <Russ.Keldorph@microsoft.com>2018-04-16 10:24:20 -0700
committerRuss Keldorph <Russ.Keldorph@microsoft.com>2018-04-16 10:24:20 -0700
commitaec93559245d3e4498397e214c8214ebe789088c (patch)
tree94a404d56d5b33a2775db0b442278a9fc89d39d7 /buildpipeline/tests
parentb3dff4d441013cbfa39ce209f45ba96d605d8e77 (diff)
parent91ce6edff7b897f1356ba43af7b26565639fb6fc (diff)
downloadcoreclr-aec93559245d3e4498397e214c8214ebe789088c.tar.gz
coreclr-aec93559245d3e4498397e214c8214ebe789088c.tar.bz2
coreclr-aec93559245d3e4498397e214c8214ebe789088c.zip
Merge commit 'master' into release/2.1
Diffstat (limited to 'buildpipeline/tests')
-rw-r--r--buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
index 58a6b80c12..3c65d64a30 100644
--- a/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/tests/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -31,7 +31,7 @@
"alwaysRun": false,
"displayName": "Setup vs dev env",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task1",
"task": {
"id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd",
@@ -53,7 +53,7 @@
"alwaysRun": false,
"displayName": "Run clean.cmd",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task2",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -74,7 +74,7 @@
"alwaysRun": false,
"displayName": "Run sync.cmd",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(),ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task3",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -95,7 +95,7 @@
"alwaysRun": false,
"displayName": "Generate version props file",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task4",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -116,7 +116,7 @@
"alwaysRun": false,
"displayName": "Run build-test.cmd",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task5",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -137,7 +137,7 @@
"alwaysRun": false,
"displayName": "Send job to Helix",
"timeoutInMinutes": 0,
- "condition": "ne(variables['PB_SkipTests'], 'true')",
+ "condition": "and(succeeded(), ne(variables['PB_SkipTests'], 'true'))",
"refName": "Task6",
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",