Remove always red SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG bot and it's builder
IIUC, the flag is no longer used.
Bug: skia:9482
Change-Id: I6c4c327423f0a356151fe0a15c45c6923deac147
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246316
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 8002baa..884d2aa 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -33,7 +33,6 @@
"Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES",
"Build-Debian9-Clang-x86_64-Debug-MSAN",
"Build-Debian9-Clang-x86_64-Debug-OpenCL",
- "Build-Debian9-Clang-x86_64-Debug-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG",
"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"Build-Debian9-Clang-x86_64-Debug-SK_USE_SKVM_BLITTER",
"Build-Debian9-Clang-x86_64-Debug-SafeStack",
@@ -389,7 +388,6 @@
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs",
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN",
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts",
- "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG",
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_SKVM_BLITTER",
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 3053132..a913f45 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -179,11 +179,6 @@
"Build-Debian9-Clang-x86_64-Debug-OpenCL"
]
},
- "Build-Debian9-Clang-x86_64-Debug-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG": {
- "tasks": [
- "Build-Debian9-Clang-x86_64-Debug-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG"
- ]
- },
"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
"tasks": [
"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
@@ -1967,11 +1962,6 @@
"Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts"
]
},
- "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG": {
- "tasks": [
- "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG"
- ]
- },
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
"tasks": [
"Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE"
@@ -5515,75 +5505,6 @@
],
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Build-Debian9-Clang-x86_64-Debug-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- },
- {
- "name": "skia/bots/clang_linux",
- "path": "clang_linux",
- "version": "version:14"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "compile",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Debian9-Clang-x86_64-Debug-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG\",\"swarm_out_dir\":\"build\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highcpu-64",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 3600000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "idempotent": true,
- "io_timeout_ns": 3600000000000,
- "isolate": "compile.isolate",
- "max_attempts": 2,
- "outputs": [
- "build"
- ],
- "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
- },
"Build-Debian9-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
"caches": [
{
@@ -30973,84 +30894,6 @@
"test"
]
},
- "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- },
- {
- "name": "skia/bots/skimage",
- "path": "skimage",
- "version": "version:39"
- },
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:207"
- },
- {
- "name": "skia/bots/svg",
- "path": "svg",
- "version": "version:9"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "test",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG\",\"gold_hashes_url\":\"https://storage.googleapis.com/skia-infra-gm/hash_files/gold-prod-hashes.txt\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Build-Debian9-Clang-x86_64-Debug-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "machine_type:n1-standard-16",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 14400000000000,
- "isolate": "test_skia_bundled.isolate",
- "max_attempts": 2,
- "outputs": [
- "test"
- ]
- },
"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
"caches": [
{
@@ -63222,72 +63065,6 @@
"max_attempts": 2,
"service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
},
- "Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG": {
- "caches": [
- {
- "name": "vpython",
- "path": "cache/vpython"
- }
- ],
- "cipd_packages": [
- {
- "name": "infra/tools/luci/kitchen/${platform}",
- "path": ".",
- "version": "git_revision:d8f38ca9494b5af249942631f9cee45927f6b4bc"
- },
- {
- "name": "infra/tools/luci-auth/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
- },
- {
- "name": "infra/tools/luci/vpython/${platform}",
- "path": "cipd_bin_packages",
- "version": "git_revision:f96db4b66034c859090be3c47eb38227277f228b"
- },
- {
- "name": "infra/gsutil",
- "path": "cipd_bin_packages",
- "version": "version:4.28"
- }
- ],
- "command": [
- "cipd_bin_packages/vpython${EXECUTABLE_SUFFIX}",
- "skia/infra/bots/run_recipe.py",
- "${ISOLATED_OUTDIR}",
- "upload_dm_results",
- "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
- "skia"
- ],
- "dependencies": [
- "Housekeeper-PerCommit-BundleRecipes",
- "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG"
- ],
- "dimensions": [
- "cpu:x86-64-Haswell_GCE",
- "gpu:none",
- "machine_type:n1-highmem-2",
- "os:Debian-9.8",
- "pool:Skia"
- ],
- "env_prefixes": {
- "PATH": [
- "cipd_bin_packages",
- "cipd_bin_packages/bin"
- ],
- "VPYTHON_VIRTUALENV_ROOT": [
- "cache/vpython"
- ]
- },
- "execution_timeout_ns": 3600000000000,
- "extra_tags": {
- "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
- },
- "io_timeout_ns": 3600000000000,
- "isolate": "swarm_recipe.isolate",
- "max_attempts": 2,
- "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
- },
"Upload-Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
"caches": [
{