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

Revert "trusty -> xenial for linux try/ci builders"

This reverts commit 2aef1e3c.

Reason for revert: crbug.com/971133

Original change's description:
> trusty -> xenial for linux try/ci builders
> 
> This will be submitted after
> https://chrome-internal-review.googlesource.com/c/infradata/config/+/1358390
> 
> But test for linux-ozone-rel is still configured to use trusty due to
> https://ci.chromium.org/p/chromium/builders/try/linux-ozone-rel/283303
> 
> Bug: 954450
> Change-Id: Ie2d93ccc409dbc494b15fdb4039aa1e7a44660c5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642851
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#666172}

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

Change-Id: Ia1e79e2b720b928c6d84cde954b5eb112113e3c1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 954450, 971133
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645136Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666188}
parent 91afef22
...@@ -1417,7 +1417,6 @@ buckets { ...@@ -1417,7 +1417,6 @@ buckets {
builders { builders {
name: "Leak Detection Linux" name: "Leak Detection Linux"
mixins: "linux-ci-goma-rbe-prod" mixins: "linux-ci-goma-rbe-prod"
mixins: "linux-xenial"
} }
builders { builders {
...@@ -1438,7 +1437,6 @@ buckets { ...@@ -1438,7 +1437,6 @@ buckets {
name: "Linux ASan Tests (sandboxed)" name: "Linux ASan Tests (sandboxed)"
mixins: "linux" mixins: "linux"
mixins: "memory-ci" mixins: "memory-ci"
mixins: "linux-xenial"
} }
builders { builders {
...@@ -1458,7 +1456,6 @@ buckets { ...@@ -1458,7 +1456,6 @@ buckets {
name: "linux-blink-animation-use-time-delta" name: "linux-blink-animation-use-time-delta"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux-xenial"
} }
builders { builders {
...@@ -1472,20 +1469,17 @@ buckets { ...@@ -1472,20 +1469,17 @@ buckets {
name: "linux-blink-heap-verification" name: "linux-blink-heap-verification"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux" mixins: "linux"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux-blink-heap-unified-gc" name: "linux-blink-heap-unified-gc"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux" mixins: "linux"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux_chromium_component_updater" name: "linux_chromium_component_updater"
mixins: "linux-ci" mixins: "linux-ci"
mixins: "linux-xenial"
recipe { recipe {
name: "findit/chromium/update_components" name: "findit/chromium/update_components"
} }
...@@ -1496,32 +1490,27 @@ buckets { ...@@ -1496,32 +1490,27 @@ buckets {
name: "linux-chromium-tests-staging-builder" name: "linux-chromium-tests-staging-builder"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux" mixins: "linux"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux-chromium-tests-staging-tests" name: "linux-chromium-tests-staging-tests"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux" mixins: "linux"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux-gcc-rel" name: "linux-gcc-rel"
mixins: "linux-ci" mixins: "linux-ci"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux-jumbo-rel" name: "linux-jumbo-rel"
mixins: "linux-ci" mixins: "linux-ci"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux-ozone-rel" name: "linux-ozone-rel"
mixins: "linux-ci" mixins: "linux-ci"
mixins: "linux-xenial"
} }
builders { builders {
...@@ -1539,13 +1528,11 @@ buckets { ...@@ -1539,13 +1528,11 @@ buckets {
builders { builders {
name: "Linux Tests (dbg)(1)" name: "Linux Tests (dbg)(1)"
mixins: "linux-ci" mixins: "linux-ci"
mixins: "linux-xenial"
} }
builders { builders {
name: "Linux Tests (dbg)(1)(32)" name: "Linux Tests (dbg)(1)(32)"
mixins: "linux-ci" mixins: "linux-ci"
mixins: "linux-xenial"
} }
builders { builders {
...@@ -3667,7 +3654,6 @@ buckets { ...@@ -3667,7 +3654,6 @@ buckets {
} }
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "linux-xenial"
name: "closure_compilation" name: "closure_compilation"
recipe { recipe {
name: "closure_compilation" name: "closure_compilation"
...@@ -3723,7 +3709,6 @@ buckets { ...@@ -3723,7 +3709,6 @@ buckets {
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
mixins: "linux-xenial"
name: "leak_detection_linux" name: "leak_detection_linux"
} }
builders { mixins: "linux-angle-try" name: "fuchsia-angle-rel" } builders { mixins: "linux-angle-try" name: "fuchsia-angle-rel" }
...@@ -3744,36 +3729,18 @@ buckets { ...@@ -3744,36 +3729,18 @@ buckets {
mixins: "linux-try" mixins: "linux-try"
name: "linux-blink-heap-concurrent-marking-tsan-rel" name: "linux-blink-heap-concurrent-marking-tsan-rel"
} }
builders { builders { mixins: "linux-try" name: "linux-blink-heap-verification-try" }
mixins: "linux-try" builders { mixins: "linux-try" name: "linux-dcheck-off-rel" }
mixins: "linux-xenial"
name: "linux-blink-heap-verification-try"
}
builders {
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux-dcheck-off-rel"
}
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-j150" mixins: "goma-j150"
mixins: "linux-xenial"
name: "linux-goma-rbe-staging-rel" name: "linux-goma-rbe-staging-rel"
} }
builders { builders { mixins: "linux-try" name: "linux-gcc-rel" }
mixins: "linux-try" builders { mixins: "linux-try" name: "linux-jumbo-rel" }
mixins: "linux-xenial"
name: "linux-gcc-rel"
}
builders {
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux-jumbo-rel"
}
builders { builders {
name: "linux-libfuzzer-asan-rel" name: "linux-libfuzzer-asan-rel"
mixins: "linux-try" mixins: "linux-try"
mixins: "linux-xenial"
recipe { recipe {
name: "chromium_libfuzzer_trybot" name: "chromium_libfuzzer_trybot"
} }
...@@ -3791,19 +3758,10 @@ buckets { ...@@ -3791,19 +3758,10 @@ buckets {
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod-ats" mixins: "goma-rbe-prod-ats"
mixins: "linux-xenial"
name: "linux_arm" name: "linux_arm"
} }
builders { builders { mixins: "linux-try" name: "linux_chromium_analysis" }
mixins: "linux-try" builders { mixins: "linux-try" name: "linux_chromium_archive_rel_ng" }
mixins: "linux-xenial"
name: "linux_chromium_analysis"
}
builders {
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux_chromium_archive_rel_ng"
}
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "linux-xenial" mixins: "linux-xenial"
...@@ -3830,30 +3788,16 @@ buckets { ...@@ -3830,30 +3788,16 @@ buckets {
name: "linux_chromium_clobber_deterministic", name: "linux_chromium_clobber_deterministic",
mixins: "linux-try" mixins: "linux-try"
mixins: "deterministic" mixins: "deterministic"
mixins: "linux-xenial"
}
builders {
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux_chromium_clobber_rel_ng"
}
builders {
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux_chromium_compile_dbg_32_ng"
} }
builders { mixins: "linux-try" name: "linux_chromium_clobber_rel_ng" }
builders { mixins: "linux-try" name: "linux_chromium_compile_dbg_32_ng" }
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "linux-debug-cache" mixins: "linux-debug-cache"
mixins: "goma-j150" mixins: "goma-j150"
mixins: "linux-xenial"
name: "linux_chromium_compile_dbg_ng" name: "linux_chromium_compile_dbg_ng"
} }
builders { builders { mixins: "linux-try" name: "linux_chromium_compile_rel_ng" }
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux_chromium_compile_rel_ng"
}
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
...@@ -3863,19 +3807,16 @@ buckets { ...@@ -3863,19 +3807,16 @@ buckets {
mixins: "linux-try" mixins: "linux-try"
mixins: "linux-debug-cache" mixins: "linux-debug-cache"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
mixins: "linux-xenial"
name: "linux_chromium_dbg_ng" name: "linux_chromium_dbg_ng"
} }
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod-j150" mixins: "goma-rbe-prod-j150"
mixins: "linux-xenial"
name: "linux_chromium_msan_rel_ng" name: "linux_chromium_msan_rel_ng"
} }
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-j150" mixins: "goma-j150"
mixins: "linux-xenial"
name: "linux-coverage-rel" name: "linux-coverage-rel"
} }
builders { builders {
...@@ -3890,30 +3831,17 @@ buckets { ...@@ -3890,30 +3831,17 @@ buckets {
mixins: "goma-j150" mixins: "goma-j150"
name: "linux_chromium_tsan_rel_ng" name: "linux_chromium_tsan_rel_ng"
} }
builders { builders { mixins: "linux-try" name: "linux_chromium_ubsan_rel_ng" }
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux_chromium_ubsan_rel_ng"
}
builders { builders {
mixins: "linux-dawn-try" mixins: "linux-dawn-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
name: "linux-dawn-rel" name: "linux-dawn-rel"
} }
builders { builders { mixins: "linux-try" name: "linux_layout_tests_composite_after_paint" }
mixins: "linux-try" builders { mixins: "linux-try" name: "linux_layout_tests_layout_ng" }
mixins: "linux-xenial"
name: "linux_layout_tests_composite_after_paint"
}
builders {
mixins: "linux-try"
mixins: "linux-xenial"
name: "linux_layout_tests_layout_ng"
}
builders { builders {
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
mixins: "linux-xenial"
name: "linux_mojo" name: "linux_mojo"
} }
builders { mixins: "linux-try" name: "linux_mojo_chromeos" } builders { mixins: "linux-try" name: "linux_mojo_chromeos" }
...@@ -4196,14 +4124,12 @@ buckets { ...@@ -4196,14 +4124,12 @@ buckets {
name: "linux-annotator-rel" name: "linux-annotator-rel"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "linux-try" mixins: "linux-try"
mixins: "linux-xenial"
} }
builders { builders {
name: "linux_vr" name: "linux_vr"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
mixins: "linux-xenial"
} }
builders { builders {
name: "android_compile_rel" name: "android_compile_rel"
...@@ -4231,7 +4157,6 @@ buckets { ...@@ -4231,7 +4157,6 @@ buckets {
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "linux-try" mixins: "linux-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
mixins: "linux-xenial"
} }
builders { builders {
name: "android_cfi_rel_ng" name: "android_cfi_rel_ng"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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