Commit 06b7ba63 authored by Stephen Roe's avatar Stephen Roe Committed by Commit Bot

Require Fuchsia arm64 test swarming bots to run in docker containers.

This helps to standardize the environment for the Fuchsia VM.
In particular, it prevents tests from running on build41-b4 which
is not set up to run Fuchsia arm64 KVM tests.

Bug: 1000901
Change-Id: I0030cb7dc807829404590f23cdb4a8595f93b1a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918312Reviewed-by: default avatarRobbie Iannucci <iannucci@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Stephen Roe <steveroe@google.com>
Cr-Commit-Position: refs/heads/master@{#715932}
parent 8aa3db7d
...@@ -11395,6 +11395,7 @@ ...@@ -11395,6 +11395,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11411,6 +11412,7 @@ ...@@ -11411,6 +11412,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11427,6 +11429,7 @@ ...@@ -11427,6 +11429,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11443,6 +11446,7 @@ ...@@ -11443,6 +11446,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11459,6 +11463,7 @@ ...@@ -11459,6 +11463,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11475,6 +11480,7 @@ ...@@ -11475,6 +11480,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11491,6 +11497,7 @@ ...@@ -11491,6 +11497,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11507,6 +11514,7 @@ ...@@ -11507,6 +11514,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11526,6 +11534,7 @@ ...@@ -11526,6 +11534,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11545,6 +11554,7 @@ ...@@ -11545,6 +11554,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11561,6 +11571,7 @@ ...@@ -11561,6 +11571,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11577,6 +11588,7 @@ ...@@ -11577,6 +11588,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11593,6 +11605,7 @@ ...@@ -11593,6 +11605,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11609,6 +11622,7 @@ ...@@ -11609,6 +11622,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11625,6 +11639,7 @@ ...@@ -11625,6 +11639,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11641,6 +11656,7 @@ ...@@ -11641,6 +11656,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11657,6 +11673,7 @@ ...@@ -11657,6 +11673,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11673,6 +11690,7 @@ ...@@ -11673,6 +11690,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11689,6 +11707,7 @@ ...@@ -11689,6 +11707,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11705,6 +11724,7 @@ ...@@ -11705,6 +11724,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11724,6 +11744,7 @@ ...@@ -11724,6 +11744,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11740,6 +11761,7 @@ ...@@ -11740,6 +11761,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11756,6 +11778,7 @@ ...@@ -11756,6 +11778,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11775,6 +11798,7 @@ ...@@ -11775,6 +11798,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11791,6 +11815,7 @@ ...@@ -11791,6 +11815,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11807,6 +11832,7 @@ ...@@ -11807,6 +11832,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11826,6 +11852,7 @@ ...@@ -11826,6 +11852,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11845,6 +11872,7 @@ ...@@ -11845,6 +11872,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11861,6 +11889,7 @@ ...@@ -11861,6 +11889,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11877,6 +11906,7 @@ ...@@ -11877,6 +11906,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11893,6 +11923,7 @@ ...@@ -11893,6 +11923,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
...@@ -11909,6 +11940,7 @@ ...@@ -11909,6 +11940,7 @@
"dimension_sets": [ "dimension_sets": [
{ {
"cpu": "arm64", "cpu": "arm64",
"inside_docker": "1",
"os": "Ubuntu-16.04" "os": "Ubuntu-16.04"
} }
] ]
......
...@@ -167,6 +167,13 @@ ...@@ -167,6 +167,13 @@
'code-coverage': { 'code-coverage': {
'isolate_coverage_data': True, 'isolate_coverage_data': True,
}, },
'docker': {
'swarming': {
'dimensions': {
'inside_docker': '1',
},
},
},
'flounder': { 'flounder': {
# Nexus 9 # Nexus 9
'swarming': { 'swarming': {
......
...@@ -1736,6 +1736,7 @@ ...@@ -1736,6 +1736,7 @@
}, },
'mixins': [ 'mixins': [
'arm64', 'arm64',
'docker',
'linux-xenial', 'linux-xenial',
], ],
}, },
......
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