Commit d18f5d2b authored by Takuto Ikuta's avatar Takuto Ikuta Committed by Commit Bot

Revert "Drop Trusty from WebKit Linux builders"

This reverts commit 622d8879.

Reason for revert: 
infra failure
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/WebKit%20Linux%20MSAN

Original change's description:
> Drop Trusty from WebKit Linux builders
> 
> I applied following command to renmae
> $ git grep --name-only 'WebKit Linux Trusty ' testing/ infra/ | \
>   xargs sed -i 's/WebKit Linux Trusty /WebKit Linux /g'
> 
> This is step 3 written in
> https://chrome-internal-review.googlesource.com/c/infradata/config/+/1341927
> 
> Bug: 954450
> Change-Id: Ia29366bcdb60d7b28b44964a89d0033855866b8a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635069
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#664591}

TBR=tikuta@chromium.org,bpastene@chromium.org,jbudorick@chromium.org

Change-Id: I86650591a406e54eda6c39d4c21eab832440b0ad
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 954450
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636661Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664610}
parent 5b84dd9c
...@@ -2254,7 +2254,7 @@ buckets { ...@@ -2254,7 +2254,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "WebKit Linux MSAN" name: "WebKit Linux Trusty MSAN"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "memory-ci" mixins: "memory-ci"
} }
...@@ -2287,7 +2287,7 @@ buckets { ...@@ -2287,7 +2287,7 @@ buckets {
mixins: "fuzz-ci" mixins: "fuzz-ci"
} }
builders { builders {
name: "WebKit Linux ASAN" name: "WebKit Linux Trusty ASAN"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "memory-ci" mixins: "memory-ci"
} }
...@@ -2344,7 +2344,7 @@ buckets { ...@@ -2344,7 +2344,7 @@ buckets {
mixins: "chromium-ci" mixins: "chromium-ci"
} }
builders { builders {
name: "WebKit Linux Leak" name: "WebKit Linux Trusty Leak"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "memory-ci" mixins: "memory-ci"
} }
......
...@@ -711,17 +711,17 @@ consoles { ...@@ -711,17 +711,17 @@ consoles {
short_name: "tst" short_name: "tst"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN" name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty ASAN"
category: "chromium.memory|linux|webkit" category: "chromium.memory|linux|webkit"
short_name: "asn" short_name: "asn"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN" name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty MSAN"
category: "chromium.memory|linux|webkit" category: "chromium.memory|linux|webkit"
short_name: "msn" short_name: "msn"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/WebKit Linux Leak" name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty Leak"
category: "chromium.memory|linux|webkit" category: "chromium.memory|linux|webkit"
short_name: "lk" short_name: "lk"
} }
...@@ -1127,17 +1127,17 @@ consoles { ...@@ -1127,17 +1127,17 @@ consoles {
short_name: "tst" short_name: "tst"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN" name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty ASAN"
category: "linux|webkit" category: "linux|webkit"
short_name: "asn" short_name: "asn"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN" name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty MSAN"
category: "linux|webkit" category: "linux|webkit"
short_name: "msn" short_name: "msn"
} }
builders { builders {
name: "buildbucket/luci.chromium.ci/WebKit Linux Leak" name: "buildbucket/luci.chromium.ci/WebKit Linux Trusty Leak"
category: "linux|webkit" category: "linux|webkit"
short_name: "lk" short_name: "lk"
} }
......
...@@ -273,9 +273,9 @@ trigger { ...@@ -273,9 +273,9 @@ trigger {
triggers: "UBSan vptr Release" triggers: "UBSan vptr Release"
triggers: "UBSanVptr Linux" triggers: "UBSanVptr Linux"
triggers: "VR Linux" triggers: "VR Linux"
triggers: "WebKit Linux ASAN" triggers: "WebKit Linux Trusty ASAN"
triggers: "WebKit Linux Leak" triggers: "WebKit Linux Trusty Leak"
triggers: "WebKit Linux MSAN" triggers: "WebKit Linux Trusty MSAN"
triggers: "Win 10 Fast Ring" triggers: "Win 10 Fast Ring"
triggers: "Win ASan Release Media" triggers: "Win ASan Release Media"
triggers: "Win ASan Release" triggers: "Win ASan Release"
...@@ -4108,32 +4108,32 @@ job { ...@@ -4108,32 +4108,32 @@ job {
} }
job { job {
id: "WebKit Linux ASAN" id: "WebKit Linux Trusty ASAN"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "WebKit Linux ASAN" builder: "WebKit Linux Trusty ASAN"
} }
} }
job { job {
id: "WebKit Linux Leak" id: "WebKit Linux Trusty Leak"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "WebKit Linux Leak" builder: "WebKit Linux Trusty Leak"
} }
} }
job { job {
id: "WebKit Linux MSAN" id: "WebKit Linux Trusty MSAN"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "WebKit Linux MSAN" builder: "WebKit Linux Trusty MSAN"
} }
} }
......
...@@ -13690,7 +13690,7 @@ ...@@ -13690,7 +13690,7 @@
} }
] ]
}, },
"WebKit Linux ASAN": { "WebKit Linux Trusty ASAN": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
...@@ -13722,7 +13722,7 @@ ...@@ -13722,7 +13722,7 @@
} }
] ]
}, },
"WebKit Linux Leak": { "WebKit Linux Trusty Leak": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
...@@ -13754,7 +13754,7 @@ ...@@ -13754,7 +13754,7 @@
} }
] ]
}, },
"WebKit Linux MSAN": { "WebKit Linux Trusty MSAN": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
......
{ {
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {},
"WebKit Linux ASAN": { "WebKit Linux Trusty ASAN": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
} }
] ]
}, },
"WebKit Linux Leak": { "WebKit Linux Trusty Leak": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
} }
] ]
}, },
"WebKit Linux MSAN": { "WebKit Linux Trusty MSAN": {
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
......
...@@ -1758,7 +1758,7 @@ ...@@ -1758,7 +1758,7 @@
], ],
}, },
# chromium.webkit. # chromium.webkit.
'WebKit Linux ASAN': { 'WebKit Linux Trusty ASAN': {
'args': [ 'args': [
'--additional-expectations', '--additional-expectations',
'../../third_party/blink/web_tests/ASANExpectations', '../../third_party/blink/web_tests/ASANExpectations',
...@@ -1775,7 +1775,7 @@ ...@@ -1775,7 +1775,7 @@
'shards': 20, 'shards': 20,
}, },
}, },
'WebKit Linux Leak': { 'WebKit Linux Trusty Leak': {
'args': [ 'args': [
'--additional-expectations', '--additional-expectations',
'../../third_party/blink/web_tests/LeakExpectations', '../../third_party/blink/web_tests/LeakExpectations',
...@@ -1792,7 +1792,7 @@ ...@@ -1792,7 +1792,7 @@
'shards': 10, 'shards': 10,
}, },
}, },
'WebKit Linux MSAN': { 'WebKit Linux Trusty MSAN': {
'args': [ 'args': [
'--additional-expectations', '--additional-expectations',
'../../third_party/blink/web_tests/MSANExpectations', '../../third_party/blink/web_tests/MSANExpectations',
......
...@@ -3757,7 +3757,7 @@ ...@@ -3757,7 +3757,7 @@
'--test-launcher-print-test-stdio=always', '--test-launcher-print-test-stdio=always',
], ],
}, },
'WebKit Linux ASAN': { 'WebKit Linux Trusty ASAN': {
'mixins': [ 'mixins': [
'linux-trusty', 'linux-trusty',
], ],
...@@ -3765,7 +3765,7 @@ ...@@ -3765,7 +3765,7 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
}, },
'WebKit Linux Leak': { 'WebKit Linux Trusty Leak': {
'mixins': [ 'mixins': [
'linux-trusty', 'linux-trusty',
], ],
...@@ -3773,7 +3773,7 @@ ...@@ -3773,7 +3773,7 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
}, },
'WebKit Linux MSAN': { 'WebKit Linux Trusty MSAN': {
'mixins': [ 'mixins': [
'linux-trusty', 'linux-trusty',
], ],
...@@ -3870,7 +3870,7 @@ ...@@ -3870,7 +3870,7 @@
'machines': { 'machines': {
# TODO(jchinlee): The below three builders are in chromium.memory on LUCI, # TODO(jchinlee): The below three builders are in chromium.memory on LUCI,
# see crbug.com/790309, crbug.com/790294, crbug.com/790286. # see crbug.com/790309, crbug.com/790294, crbug.com/790286.
'WebKit Linux ASAN': { 'WebKit Linux Trusty ASAN': {
'mixins': [ 'mixins': [
'linux-trusty', 'linux-trusty',
], ],
...@@ -3878,7 +3878,7 @@ ...@@ -3878,7 +3878,7 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
}, },
'WebKit Linux Leak': { 'WebKit Linux Trusty Leak': {
'mixins': [ 'mixins': [
'linux-trusty', 'linux-trusty',
], ],
...@@ -3886,7 +3886,7 @@ ...@@ -3886,7 +3886,7 @@
'isolated_scripts': 'chromium_webkit_isolated_scripts', 'isolated_scripts': 'chromium_webkit_isolated_scripts',
}, },
}, },
'WebKit Linux MSAN': { 'WebKit Linux Trusty MSAN': {
'mixins': [ 'mixins': [
'linux-trusty', 'linux-trusty',
], ],
......
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