aboutsummaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorBrandon Tolsch <btolsch@chromium.org>2019-07-22 19:14:34 +0000
committerBrandon Tolsch <btolsch@chromium.org>2019-07-22 19:23:20 +0000
commit9d92a359190fa5631bd6f3aadce2f09d76d4c2c5 (patch)
treeb83f251943cb2b3f71e12686663459ed0ccba07f /infra
parentc8bda28451bdce5cb5f02c1093d94e52ed0b46d3 (diff)
downloadopenscreen-9d92a359190fa5631bd6f3aadce2f09d76d4c2c5.tar.gz
Revert "Add config to test 18.04 try bots"
This reverts commit c8bda28451bdce5cb5f02c1093d94e52ed0b46d3. Reason for revert: noexcept causing problems w/ and w/o -Wno-noexcept-type (for different reasons) and no apparent short-term fix. Original change's description: > Add config to test 18.04 try bots > > There is now an 18.04 bot in luci.flex.try that we can use. If we make > sure it works for our repo, they should also be adding one to > luci.flex.ci. > > Bug: openscreen:40 > Change-Id: I077ea916c10adc6cf5a6560d944f4d62a2849974 > Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1710958 > Reviewed-by: Max Yakimakha <yakimakha@chromium.org> > Commit-Queue: Brandon Tolsch <btolsch@chromium.org> TBR=btolsch@chromium.org,jophba@chromium.org,rwkeane@google.com,yakimakha@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: openscreen:40 Change-Id: Ibcb5028a666bdddeea1356abaaef7e9d72876855 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1713567 Reviewed-by: Brandon Tolsch <btolsch@chromium.org> Reviewed-by: Max Yakimakha <yakimakha@chromium.org>
Diffstat (limited to 'infra')
-rw-r--r--infra/config/global/cr-buildbucket.cfg12
1 files changed, 3 insertions, 9 deletions
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 3e8cd603..7e8fe9cb 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -53,12 +53,6 @@ builder_mixins {
dimensions: "os:Ubuntu-16.04"
}
-# TODO(btolsch): Make this standard "linux" if 18.04 sticks + lands in ci pool.
-builder_mixins {
- name: "linux-18.04"
- dimensions: "os:Ubuntu-18.04"
-}
-
builder_mixins {
name: "gcc"
recipe {
@@ -166,7 +160,7 @@ buckets: {
builders {
name: "linux64_debug"
- mixins: "linux-18.04"
+ mixins: "linux"
mixins: "debug"
mixins: "x64"
mixins: "asan"
@@ -174,7 +168,7 @@ buckets: {
builders {
name: "linux64_debug_gcc"
- mixins: "linux-18.04"
+ mixins: "linux"
mixins: "debug"
mixins: "x64"
mixins: "gcc"
@@ -193,7 +187,7 @@ buckets: {
name: "run_presubmit"
properties: "repo_name:openscreen"
}
- mixins: "linux-18.04"
+ mixins: "linux"
mixins: "x64"
}
}