Skip to content

GitLab

T
tangled
Commit 8292af08 authored by Zhaoyang Li's avatar Zhaoyang Li Committed by Commit Bot
Browse files
Options

Add restart arg and extend expiration time for ToTiOSDevice tests. 

This restart test runner arg will issue a restart to device when the
test framework hangs before any test starts.

Set limited_capacity_bot for the tests because the tasks started to be
timed out due to capacity (only one machine).

Bug: 1137829
Change-Id: Ie8f7b5daa214819745163302a7769b82cd9b8ef5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2470256Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817175}
parent 6baea144
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 0 deletions
testing/buildbot/chromium.clang.json
View file @ 8292af08
...@@ -41984,6 +41984,7 @@ ...@@ -41984,6 +41984,7 @@
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42014,6 +42015,7 @@ ...@@ -42014,6 +42015,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42026,6 +42028,7 @@ ...@@ -42026,6 +42028,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42056,6 +42059,7 @@ ...@@ -42056,6 +42059,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42068,6 +42072,7 @@ ...@@ -42068,6 +42072,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42098,6 +42103,7 @@ ...@@ -42098,6 +42103,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42110,6 +42116,7 @@ ...@@ -42110,6 +42116,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42140,6 +42147,7 @@ ...@@ -42140,6 +42147,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42152,6 +42160,7 @@ ...@@ -42152,6 +42160,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42182,6 +42191,7 @@ ...@@ -42182,6 +42191,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42194,6 +42204,7 @@ ...@@ -42194,6 +42204,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42224,6 +42235,7 @@ ...@@ -42224,6 +42235,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42236,6 +42248,7 @@ ...@@ -42236,6 +42248,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42266,6 +42279,7 @@ ...@@ -42266,6 +42279,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42278,6 +42292,7 @@ ...@@ -42278,6 +42292,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42308,6 +42323,7 @@ ...@@ -42308,6 +42323,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42320,6 +42336,7 @@ ...@@ -42320,6 +42336,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42350,6 +42367,7 @@ ...@@ -42350,6 +42367,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42362,6 +42380,7 @@ ...@@ -42362,6 +42380,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42392,6 +42411,7 @@ ...@@ -42392,6 +42411,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42404,6 +42424,7 @@ ...@@ -42404,6 +42424,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42434,6 +42455,7 @@ ...@@ -42434,6 +42455,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42446,6 +42468,7 @@ ...@@ -42446,6 +42468,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42476,6 +42499,7 @@ ...@@ -42476,6 +42499,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42488,6 +42512,7 @@ ...@@ -42488,6 +42512,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42518,6 +42543,7 @@ ...@@ -42518,6 +42543,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42530,6 +42556,7 @@ ...@@ -42530,6 +42556,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42560,6 +42587,7 @@ ...@@ -42560,6 +42587,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42572,6 +42600,7 @@ ...@@ -42572,6 +42600,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42602,6 +42631,7 @@ ...@@ -42602,6 +42631,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42614,6 +42644,7 @@ ...@@ -42614,6 +42644,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42644,6 +42675,7 @@ ...@@ -42644,6 +42675,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42656,6 +42688,7 @@ ...@@ -42656,6 +42688,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42686,6 +42719,7 @@ ...@@ -42686,6 +42719,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
...@@ -42698,6 +42732,7 @@ ...@@ -42698,6 +42732,7 @@
}, },
{ {
"args": [ "args": [
"--restart",
"--out-dir", "--out-dir",
"${ISOLATED_OUTDIR}", "${ISOLATED_OUTDIR}",
"--xcode-build-version", "--xcode-build-version",
...@@ -42728,6 +42763,7 @@ ...@@ -42728,6 +42763,7 @@
"os": "Mac-10.15" "os": "Mac-10.15"
} }
], ],
"expiration": 21600,
"named_caches": [ "named_caches": [
{ {
"name": "xcode_ios_12a7209", "name": "xcode_ios_12a7209",
testing/buildbot/mixins.pyl
View file @ 8292af08
...@@ -316,6 +316,13 @@ ...@@ -316,6 +316,13 @@
], ],
}, },
}, },
'ios_restart_device': {
'$mixin_append': {
'args': [
'--restart',
],
},
},
'isolate_profile_data': { 'isolate_profile_data': {
'isolate_profile_data': True, 'isolate_profile_data': True,
}, },
......
testing/buildbot/waterfalls.pyl
View file @ 8292af08
...@@ -1647,6 +1647,8 @@ ...@@ -1647,6 +1647,8 @@
'url_unittests' 'url_unittests'
], ],
'mixins': [ 'mixins': [
'ios_restart_device',
'limited_capacity_bot',
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment