From 5eaa297267ab2df13598f74425e036c19e9cfaec Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 29 Nov 2017 16:10:39 -0500 Subject: [PATCH] Revert "Temporarily add Ubuntu IntelHD4400 jobs." This reverts commit 373588426b9d02576152e820eb7f870d930f1998. Reason for revert: Have enough digests on Gold now. Original change's description: > Temporarily add Ubuntu IntelHD4400 jobs. > > I want to compare this with the IntelBayTrail and if the results are > similar, replace those bots. > > No-Try: true > Change-Id: Ib5476fe91dc446182cd1b37e93fe17962dcf961a > Reviewed-on: https://skia-review.googlesource.com/76900 > Reviewed-by: Kevin Lubick > Commit-Queue: Ben Wagner TBR=benjaminwagner@google.com,kjlubick@google.com Change-Id: Ica07d1ee635e59e3d3da51ee73591ffe08310e34 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/77860 Commit-Queue: Ben Wagner Reviewed-by: Ben Wagner --- infra/bots/gen_tasks.go | 1 - infra/bots/jobs.json | 4 - infra/bots/recipes/perf.py | 1 - infra/bots/recipes/test.py | 1 - infra/bots/tasks.json | 315 ------------------------------------- 5 files changed, 322 deletions(-) diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index bf59ae53cb..a2c0e5b860 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -310,7 +310,6 @@ func defaultSwarmDimensions(parts map[string]string) []string { "IntelBayTrail": "8086:0f31", "IntelHD2000": "8086:0102", "IntelHD405": "8086:22b1", - "IntelHD4400": "8086:0a16", "IntelIris540": "8086:1926", "IntelIris640": "8086:5926", "QuadroP400": "10de:1cb3-384.59", diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index ed7a4876db..df3dd09b91 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -195,8 +195,6 @@ "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All", "Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan", - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All", "Perf-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All", @@ -398,8 +396,6 @@ "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-Vulkan", "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All", "Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan", - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All", "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All", "Test-Ubuntu16-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index c1fe634479..cc414efed0 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -95,7 +95,6 @@ def nanobench_flags(api, bot): # The following devices do not support glessrgb. if 'glessrgb' in configs: if ('IntelHD405' in bot or - 'IntelHD4400' in bot or 'IntelIris540' in bot or 'IntelIris640' in bot or 'IntelBayTrail' in bot or diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index e44f41df12..c95f8c57be 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -179,7 +179,6 @@ def dm_flags(api, bot): # The following devices do not support glessrgb. if 'glessrgb' in configs: if ('IntelHD405' in bot or - 'IntelHD4400' in bot or 'IntelIris540' in bot or 'IntelIris640' in bot or 'IntelBayTrail' in bot or diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 844ab895e3..eee9ebb984 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -1185,18 +1185,6 @@ "Upload-Perf-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan" ] }, - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { - "priority": 0.8, - "tasks": [ - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All" - ] - }, - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "priority": 0.8, - "tasks": [ - "Upload-Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" - ] - }, "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "priority": 0.8, "tasks": [ @@ -2405,18 +2393,6 @@ "Upload-Test-Ubuntu16-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan" ] }, - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { - "priority": 0.8, - "tasks": [ - "Upload-Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All" - ] - }, - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "priority": 0.8, - "tasks": [ - "Upload-Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" - ] - }, "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "priority": 0.8, "tasks": [ @@ -9667,110 +9643,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:33" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:99" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - }, - { - "name": "skia/bots/linux_vulkan_intel_driver_debug", - "path": "linux_vulkan_intel_driver_debug", - "version": "version:4" - } - ], - "dependencies": [ - "Build-Debian9-Clang-x86_64-Debug", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:8086:0a16", - "os:Ubuntu-16.10", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "perf", - "repository=<(REPO)", - "buildername=Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "perf_skia_bundled_unix.isolate", - "max_attempts": 1, - "priority": 0.8 - }, - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:33" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:99" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - }, - { - "name": "skia/bots/linux_vulkan_intel_driver_release", - "path": "linux_vulkan_intel_driver_release", - "version": "version:6" - } - ], - "dependencies": [ - "Build-Debian9-Clang-x86_64-Release", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:8086:0a16", - "os:Ubuntu-16.10", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "perf", - "repository=<(REPO)", - "buildername=Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "perf_skia_bundled_unix.isolate", - "max_attempts": 1, - "priority": 0.8 - }, "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "cipd_packages": [ { @@ -19115,112 +18987,6 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:33" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:99" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - }, - { - "name": "skia/bots/linux_vulkan_intel_driver_debug", - "path": "linux_vulkan_intel_driver_debug", - "version": "version:4" - } - ], - "dependencies": [ - "Build-Debian9-Clang-x86_64-Debug", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:8086:0a16", - "os:Ubuntu-16.10", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "test", - "repository=<(REPO)", - "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", - "buildername=Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "test_skia_bundled_unix.isolate", - "max_attempts": 1, - "priority": 0.8 - }, - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:33" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:99" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:9" - }, - { - "name": "skia/bots/linux_vulkan_intel_driver_release", - "path": "linux_vulkan_intel_driver_release", - "version": "version:6" - } - ], - "dependencies": [ - "Build-Debian9-Clang-x86_64-Release", - "Housekeeper-PerCommit-BundleRecipes" - ], - "dimensions": [ - "gpu:8086:0a16", - "os:Ubuntu-16.10", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "test", - "repository=<(REPO)", - "buildbucket_build_id=<(BUILDBUCKET_BUILD_ID)", - "buildername=Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "test_skia_bundled_unix.isolate", - "max_attempts": 1, - "priority": 0.8 - }, "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "cipd_packages": [ { @@ -25819,33 +25585,6 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, - "Upload-Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "dependencies": [ - "Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "os:Debian-9.2", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_nano_results", - "repository=<(REPO)", - "buildername=Perf-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)", - "gs_bucket=skia-perf" - ], - "isolate": "upload_nano_results.isolate", - "priority": 0.8 - }, "Upload-Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": { "dependencies": [ "Perf-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All" @@ -29483,60 +29222,6 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All": { - "dependencies": [ - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "os:Debian-9.2", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)", - "gs_bucket=skia-infra-gm" - ], - "isolate": "upload_dm_results.isolate", - "priority": 0.8 - }, - "Upload-Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": { - "dependencies": [ - "Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All" - ], - "dimensions": [ - "cpu:x86-64-Haswell_GCE", - "gpu:none", - "os:Debian-9.2", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-Ubuntu16-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_repo=<(PATCH_REPO)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)", - "gs_bucket=skia-infra-gm" - ], - "isolate": "upload_dm_results.isolate", - "priority": 0.8 - }, "Upload-Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": { "dependencies": [ "Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All"