From 4f77bd050563279050f9ae0da6ed9109b0ac7006 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Tue, 7 Feb 2017 10:22:43 -0500 Subject: [PATCH] Tear down 32-bit iOS test/perf bots. The 64-bit bots look fine. We're only testing GPU on iOS, so it's not super critical to have 32-bit iOS testers. I'll keep the builders. Change-Id: I405153fd9da63b541584d78bdb975b5800679391 Reviewed-on: https://skia-review.googlesource.com/8114 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- infra/bots/jobs.json | 4 - infra/bots/tasks.json | 306 ------------------------------------------ 2 files changed, 310 deletions(-) diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index 43f712df6f..a99c23d6bd 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -162,8 +162,6 @@ "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug", "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI", "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release", - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug", - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release", "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug", "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release", "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android", @@ -267,8 +265,6 @@ "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI", - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug", - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release", "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug", "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release" ] diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 25036dd010..09e6d5ae48 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -980,18 +980,6 @@ "Upload-Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release" ] }, - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": { - "priority": 0.8, - "tasks": [ - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug" - ] - }, - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": { - "priority": 0.8, - "tasks": [ - "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release" - ] - }, "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": { "priority": 0.8, "tasks": [ @@ -1611,18 +1599,6 @@ "Upload-Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI" ] }, - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": { - "priority": 0.8, - "tasks": [ - "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug" - ] - }, - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": { - "priority": 0.8, - "tasks": [ - "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release" - ] - }, "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": { "priority": 0.8, "tasks": [ @@ -8241,102 +8217,6 @@ "isolate": "perf_skia.isolate", "priority": 0.8 }, - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:20" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:34" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:3" - } - ], - "dependencies": [ - "Build-Mac-Clang-arm-Debug-iOS" - ], - "dimensions": [ - "device:iPad5,1", - "os:iOS-9.3.1", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "swarm_perf", - "repository=<(REPO)", - "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", - "priority": 0.8 - }, - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:20" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:34" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:3" - } - ], - "dependencies": [ - "Build-Mac-Clang-arm-Release-iOS" - ], - "dimensions": [ - "device:iPad5,1", - "os:iOS-9.3.1", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "swarm_perf", - "repository=<(REPO)", - "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "perf_skia.isolate", - "priority": 0.8 - }, "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": { "cipd_packages": [ { @@ -13322,102 +13202,6 @@ "isolate": "test_skia.isolate", "priority": 0.8 }, - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:20" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:34" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:3" - } - ], - "dependencies": [ - "Build-Mac-Clang-arm-Debug-iOS" - ], - "dimensions": [ - "device:iPad5,1", - "os:iOS-9.3.1", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "swarm_test", - "repository=<(REPO)", - "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", - "priority": 0.8 - }, - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": { - "cipd_packages": [ - { - "name": "skia/bots/skimage", - "path": "skimage", - "version": "version:20" - }, - { - "name": "skia/bots/skp", - "path": "skp", - "version": "version:34" - }, - { - "name": "skia/bots/svg", - "path": "svg", - "version": "version:3" - } - ], - "dependencies": [ - "Build-Mac-Clang-arm-Release-iOS" - ], - "dimensions": [ - "device:iPad5,1", - "os:iOS-9.3.1", - "pool:Skia" - ], - "execution_timeout_ns": 14400000000000, - "expiration_ns": 72000000000000, - "extra_args": [ - "--workdir", - "../../..", - "swarm_test", - "repository=<(REPO)", - "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)" - ], - "io_timeout_ns": 2400000000000, - "isolate": "test_skia.isolate", - "priority": 0.8 - }, "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": { "cipd_packages": [ { @@ -14804,36 +14588,6 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, - "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": { - "dependencies": [ - "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release" - ], - "dimensions": [ - "cpu:x86-64-avx2", - "gpu:none", - "os:Ubuntu-14.04", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_nano_results", - "repository=<(REPO)", - "buildername=Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "patch_storage=<(PATCH_STORAGE)", - "patch_issue=<(ISSUE)", - "patch_set=<(PATCHSET)", - "gs_bucket=skia-perf" - ], - "isolate": "upload_nano_results.isolate", - "priority": 0.8 - }, "Upload-Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release": { "dependencies": [ "Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Release" @@ -17564,66 +17318,6 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug": { - "dependencies": [ - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug" - ], - "dimensions": [ - "cpu:x86-64-avx2", - "gpu:none", - "os:Ubuntu-14.04", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release": { - "dependencies": [ - "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release" - ], - "dimensions": [ - "cpu:x86-64-avx2", - "gpu:none", - "os:Ubuntu-14.04", - "pool:Skia" - ], - "extra_args": [ - "--workdir", - "../../..", - "upload_dm_results", - "repository=<(REPO)", - "buildername=Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release", - "mastername=fake-master", - "buildnumber=2", - "slavename=fake-buildslave", - "nobuildbot=True", - "swarm_out_dir=${ISOLATED_OUTDIR}", - "revision=<(REVISION)", - "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-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug": { "dependencies": [ "Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug"