aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json (renamed from infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json)26
-rw-r--r--infra/bots/recipes/swarm_trigger.py5
2 files changed, 15 insertions, 16 deletions
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 1e89de0b57..56758ed216 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -4,7 +4,7 @@
"python",
"-u",
"\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n",
- "{\"buildername\": \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
+ "{\"buildername\": \"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
],
"name": "print properties",
"~followup_annotations": [
@@ -337,7 +337,7 @@
"--shards",
"1",
"--task-name",
- "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5",
+ "compile_skia/Ubuntu/[dummy has/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -358,7 +358,7 @@
"--tag",
"allow_milo:1",
"--tag",
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+ "buildername:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
"--tag",
"buildnumber:5",
"--tag",
@@ -383,7 +383,7 @@
"--workdir",
"../../..",
"swarm_compile",
- "buildername=Build-Ubuntu-GCC-x86_64-Debug-MSAN",
+ "buildername=Build-Ubuntu-Clang-x86_64-Debug-MSAN",
"mastername=client.skia.compile",
"buildnumber=1",
"slavename=skiabot-dummy-compile-slave",
@@ -394,9 +394,9 @@
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -419,7 +419,7 @@
"--decorate",
"--print-status-updates",
"--json",
- "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+ "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
"--task-summary-json",
"/path/to/tmp/json"
],
@@ -605,7 +605,7 @@
"--shards",
"1",
"--task-name",
- "test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5",
+ "test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5",
"--dump-json",
"/path/to/tmp/json",
"--expiration",
@@ -629,7 +629,7 @@
"--tag",
"allow_milo:1",
"--tag",
- "buildername:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+ "buildername:Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
"--tag",
"buildnumber:5",
"--tag",
@@ -657,7 +657,7 @@
"--workdir",
"../../..",
"swarm_test",
- "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN",
+ "buildername=Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN",
"mastername=client.skia",
"buildnumber=5",
"slavename=skiabot-linux-swarm-000",
@@ -668,9 +668,9 @@
"name": "[trigger] test_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
@@ -715,7 +715,7 @@
"--decorate",
"--print-status-updates",
"--json",
- "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+ "{\"base_task_name\": \"test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\", \"tasks\": {\"test_skia/Ubuntu/def456/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
"--task-summary-json",
"/path/to/tmp/json",
"--task-output-dir",
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index a5c0d7d121..a95effe7f5 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -53,8 +53,8 @@ TEST_BUILDERS = {
'Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release',
'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release',
'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot',
+ 'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug',
- 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared',
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release',
@@ -364,8 +364,7 @@ def compile_steps_swarm(api, builder_cfg, got_revision, infrabots_dir):
else:
cipd_packages.append(cipd_pkg(api, infrabots_dir, 'android_ndk_linux'))
- if 'Ubuntu' in builder_name and (
- 'SAN' in builder_name or 'Clang' in builder_name):
+ if 'Ubuntu' in builder_name and 'Clang' in builder_name:
cipd_packages.append(cipd_pkg(api, infrabots_dir, 'clang_linux'))
# Windows bots require a toolchain.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 14:26:29 +0000