From 88611a1a717721c7e7aff1d691dd9af850c35259 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 26 Apr 2018 09:46:45 -0400 Subject: [PATCH] Update test expectations for Debian9 The removal of the blacklists is really a no-op because of https://skia-review.googlesource.com/c/skia/+/9339 Bug: skia:7840 Change-Id: I72e2e03bbbc813737655a3d5f3a1e874d3a41909 Reviewed-on: https://skia-review.googlesource.com/123925 Reviewed-by: Ben Wagner Commit-Queue: Kevin Lubick --- infra/bots/gen_tasks.go | 1 - ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json} | 0 infra/bots/recipe_modules/flavor/examples/full.py | 2 +- ...PYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json} | 0 ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json} | 0 ...7i5BNK-GPU-IntelIris640-x86_64-Release-All.json} | 10 +++++----- infra/bots/recipes/perf.py | 12 ++++++------ ...g-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json} | 4 ++-- ...H-GPU-IntelHD405-x86_64-Release-All-Vulkan.json} | 4 ++-- ...K-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json} | 4 ++-- ...15TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json} | 4 ++-- infra/bots/recipes/test.py | 13 ++++--------- 12 files changed, 24 insertions(+), 30 deletions(-) rename infra/bots/recipe_modules/flavor/examples/full.expected/{Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json => Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json} (100%) rename infra/bots/recipes/perf.expected/{Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json => Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json} (100%) rename infra/bots/recipes/perf.expected/{Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json => Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json} (100%) rename infra/bots/recipes/perf.expected/{Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json => Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json} (91%) rename infra/bots/recipes/test.expected/{Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json => Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json} (99%) rename infra/bots/recipes/test.expected/{Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json => Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json} (99%) rename infra/bots/recipes/test.expected/{Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json => Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json} (99%) rename infra/bots/recipes/test.expected/{Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json => Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json} (99%) diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 03b14e22ce..950ebda530 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -363,7 +363,6 @@ func defaultSwarmDimensions(parts map[string]string) []string { "Debian9": DEFAULT_OS_DEBIAN, "Mac": DEFAULT_OS_MAC, "Ubuntu14": DEFAULT_OS_UBUNTU, - "Ubuntu16": "Ubuntu-16.10", "Ubuntu17": "Ubuntu-17.04", "Win": DEFAULT_OS_WIN, "Win10": "Windows-10-16299.371", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json similarity index 100% rename from infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json rename to infra/bots/recipe_modules/flavor/examples/full.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index cad7c09f98..39ae10c58c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -109,9 +109,9 @@ TEST_BUILDERS = [ 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Coverage', 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SwiftShader', 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN', + 'Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan', 'Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All', 'Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug-All-ASAN', - 'Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan', ('Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All' '-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41'), 'Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump', diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json similarity index 100% rename from infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json rename to infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan.json diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json similarity index 100% rename from infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json rename to infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json similarity index 91% rename from infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json rename to infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json index 0f608fdd59..c4d566a37f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All.json @@ -91,7 +91,7 @@ "--json-output", "/path/to/tmp/json", "rmtree", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" + "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" ], "infra_step": true, "name": "rmtree data" @@ -106,7 +106,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" + "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data" ], "infra_step": true, "name": "makedirs data" @@ -189,7 +189,7 @@ "~inc1.webp", "--verbose", "--outResultsFile", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data/nanobench_abc123_1337000001.json", + "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All/data/nanobench_abc123_1337000001.json", "--properties", "gitHash", "abc123", @@ -209,7 +209,7 @@ "model", "NUC7i5BNK", "os", - "Ubuntu16" + "Debian9" ], "cwd": "[START_DIR]/skia", "env": { @@ -233,7 +233,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All" + "[START_DIR]/[SWARM_OUT_DIR]/perfdata/Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All" ], "infra_step": true, "name": "makedirs perf_dir" diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index 2548265687..c931437025 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -356,17 +356,17 @@ TEST_BUILDERS = [ 'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release-All', 'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN', 'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All', + 'Perf-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan', + 'Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan', + 'Perf-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All', 'Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All', 'Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All', ('Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All-' - 'CommandBuffer'), - 'Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan', - 'Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan', - 'Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All', + 'CommandBuffer'), ('Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-' - 'Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41'), + 'Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41'), ('Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-' - 'Valgrind_SK_CPU_LIMIT_SSE41'), + 'Valgrind_SK_CPU_LIMIT_SSE41'), 'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE', 'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan', 'Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE', diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json similarity index 99% rename from infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json rename to infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json index f406368cb2..aa3643bd32 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All.json @@ -224,7 +224,7 @@ "gitHash", "abc123", "builder", - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All", + "Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All", "buildbucket_build_id", "123454321", "swarming_bot_id", @@ -247,7 +247,7 @@ "model", "NUC5PPYH", "os", - "Ubuntu16", + "Debian9", "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json similarity index 99% rename from infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json rename to infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json index 26681ddbde..69fd2dc382 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan.json @@ -224,7 +224,7 @@ "gitHash", "abc123", "builder", - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan", + "Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan", "buildbucket_build_id", "123454321", "swarming_bot_id", @@ -249,7 +249,7 @@ "model", "NUC5PPYH", "os", - "Ubuntu16", + "Debian9", "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json similarity index 99% rename from infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json rename to infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json index 01cb7efadd..3ca48272a2 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan.json @@ -224,7 +224,7 @@ "gitHash", "abc123", "builder", - "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", + "Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", "buildbucket_build_id", "123454321", "swarming_bot_id", @@ -249,7 +249,7 @@ "model", "NUC7i5BNK", "os", - "Ubuntu16", + "Debian9", "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json similarity index 99% rename from infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json rename to infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json index 4501c6940d..26a1e9f1c4 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json +++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All.json @@ -224,7 +224,7 @@ "gitHash", "abc123", "builder", - "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", + "Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", "buildbucket_build_id", "123454321", "swarming_bot_id", @@ -247,7 +247,7 @@ "model", "NUCDE3815TYKHE", "os", - "Ubuntu16", + "Debian9", "--uninterestingHashesFile", "[START_DIR]/tmp/uninteresting_hashes.txt", "--writePath", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index c95b559a94..9d8f7417fe 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -519,11 +519,6 @@ def dm_flags(api, bot): for raw_ext in r: blacklist('_ image _ .%s' % raw_ext) - if 'IntelHD405' in bot and 'Ubuntu16' in bot: - # skia:6331 - blacklist(['glmsaa8', 'image', 'gen_codec_gpu', 'abnormal.wbmp']) - blacklist(['glesmsaa4', 'image', 'gen_codec_gpu', 'abnormal.wbmp']) - if 'Nexus5' in bot and 'GPU' in bot: # skia:5876 blacklist(['_', 'gm', '_', 'encode-platform']) @@ -981,6 +976,10 @@ TEST_BUILDERS = [ '-SK_FORCE_RASTER_PIPELINE_BLITTER'), 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SwiftShader', 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN', + 'Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All', + 'Test-Debian9-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan', + 'Test-Debian9-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan', + 'Test-Debian9-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All', 'Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All', 'Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All', 'Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All', @@ -988,10 +987,6 @@ TEST_BUILDERS = [ 'Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release-All', 'Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer', 'Test-Mac-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts', - 'Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All', - 'Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan', - 'Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan', - 'Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All', 'Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage', ('Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All' '-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41'),