Merge in 'release/6.0' changes

dotnet-bot · dotnet-bot · commit 613f59789792 · 2022-08-03T19:51:22.000Z
diff --git a/eng/test-configuration.json b/eng/test-configuration.json
@@ -1,6 +1,6 @@
 {
   "version" : 1,
-  "defaultOnFailure": "fail",
+  "defaultOnFailure": "retry",
   "localRerunCount" : 3,
   "retryOnRules": [
     {"testName": {"contains": "AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess"}},
@@ -15,4 +15,4 @@
   ],
   "quarantineRules": [
   ]
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version" : 1,`
`3`		`- "defaultOnFailure": "fail",`
	`3`	`+ "defaultOnFailure": "retry",`
`4`	`4`	`"localRerunCount" : 3,`
`5`	`5`	`"retryOnRules": [`
`6`	`6`	`{"testName": {"contains": "AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess"}},`
`@@ -15,4 +15,4 @@`
`15`	`15`	`],`
`16`	`16`	`"quarantineRules": [`
`17`	`17`	`]`
`18`		`-}`
	`18`	`+}`