From 5163831a9e60e28da27f86631b425868642fe6ea Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Fri, 21 Aug 2020 16:04:56 -0400 Subject: [PATCH] Rename RecreateSKPs_Canary to RecreateSKPs_DryRun Change-Id: Icc731852d3b9efdec70c649cfcc4b5c9a47bc584 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/312492 Reviewed-by: Eric Boren Commit-Queue: Ravi Mistry --- infra/bots/jobs.json | 2 +- ....json => Housekeeper-Nightly-RecreateSKPs_DryRun.json} | 0 infra/bots/recipes/recreate_skps.py | 8 ++++---- infra/bots/tasks.json | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename infra/bots/recipes/recreate_skps.expected/{Housekeeper-Nightly-RecreateSKPs_Canary.json => Housekeeper-Nightly-RecreateSKPs_DryRun.json} (100%) diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index a87c1eac3e..05858140f9 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -148,7 +148,7 @@ "Canary-Flutter", "Canary-G3", "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All", - "Housekeeper-Nightly-RecreateSKPs_Canary", + "Housekeeper-Nightly-RecreateSKPs_DryRun", "Housekeeper-Nightly-UpdateGoDeps", "Housekeeper-OnDemand-Presubmit", "Housekeeper-PerCommit", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_DryRun.json similarity index 100% rename from infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json rename to infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_DryRun.json diff --git a/infra/bots/recipes/recreate_skps.py b/infra/bots/recipes/recreate_skps.py index 392cd625e9..20943ffc43 100644 --- a/infra/bots/recipes/recreate_skps.py +++ b/infra/bots/recipes/recreate_skps.py @@ -25,7 +25,7 @@ DEPS = [ TEST_BUILDERS = { 'client.skia.compile': { 'skiabot-linux-swarm-000': [ - 'Housekeeper-Nightly-RecreateSKPs_Canary', + 'Housekeeper-Nightly-RecreateSKPs_DryRun', 'Housekeeper-Weekly-RecreateSKPs', ], }, @@ -74,13 +74,13 @@ def RunSteps(api): '--chrome_src_path', src_dir, '--browser_executable', src_dir.join('out', 'Release', 'chrome'), '--target_dir', output_dir] - if 'Canary' not in api.properties['buildername']: + if 'DryRun' not in api.properties['buildername']: cmd.append('--upload_to_partner_bucket') with api.context(cwd=skia_dir): api.run(api.step, 'Recreate SKPs', cmd=cmd) # Upload the SKPs. - if 'Canary' not in api.properties['buildername']: + if 'DryRun' not in api.properties['buildername']: cmd = ['python', skia_dir.join('infra', 'bots', 'upload_skps.py'), '--target_dir', output_dir, @@ -90,7 +90,7 @@ def RunSteps(api): def GenTests(api): - builder = 'Housekeeper-Nightly-RecreateSKPs_Canary' + builder = 'Housekeeper-Nightly-RecreateSKPs_DryRun' yield ( api.test(builder) + api.properties(buildername=builder, diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 59fa4e559e..26856bb6c8 100755 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -753,9 +753,9 @@ "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All" ] }, - "Housekeeper-Nightly-RecreateSKPs_Canary": { + "Housekeeper-Nightly-RecreateSKPs_DryRun": { "tasks": [ - "Housekeeper-Nightly-RecreateSKPs_Canary" + "Housekeeper-Nightly-RecreateSKPs_DryRun" ], "trigger": "nightly" }, @@ -15005,7 +15005,7 @@ "max_attempts": 1, "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" }, - "Housekeeper-Nightly-RecreateSKPs_Canary": { + "Housekeeper-Nightly-RecreateSKPs_DryRun": { "caches": [ { "name": "git", @@ -15075,7 +15075,7 @@ "skia/infra/bots/run_recipe.py", "${ISOLATED_OUTDIR}", "recreate_skps", - "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-Nightly-RecreateSKPs_Canary\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}", + "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-Nightly-RecreateSKPs_DryRun\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}", "skia" ], "dependencies": [