From 0973a371ecb55a97d84d18c236df6180bca41e6d Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 15 Sep 2016 08:27:33 -0700 Subject: [PATCH] Pass rietveld as the default patch_storage. Passing around empty strings as command line arguments requires us to be really careful about command line quoting, parsing, etc. It seems easy enough here to just supply the implied value. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2323233003 Review-Url: https://codereview.chromium.org/2323233003 --- infra/bots/recipe_modules/vars/api.py | 2 +- ...f-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json | 2 +- infra/bots/recipes/swarm_perf.expected/big_issue_number.json | 2 +- ...Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json | 4 ++-- ...est-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json | 2 +- infra/bots/recipes/swarm_test.expected/big_issue_number.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 54da3b3559..b2b51b30ac 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -108,7 +108,7 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.default_env.update({'SKIA_OUT': self.skia_out, 'BUILDTYPE': self.configuration}) self.is_trybot = self.builder_cfg['is_trybot'] - self.patch_storage = self.m.properties.get('patch_storage', '') + self.patch_storage = self.m.properties.get('patch_storage', 'rietveld') self.issue = None self.patchset = None if self.is_trybot: diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index 207b4913cc..119502c4a5 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -167,7 +167,7 @@ "patchset", "1", "patch_storage", - "", + "rietveld", "--key", "arch", "x86_64", diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index 06179ebd6d..24ff80d572 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -167,7 +167,7 @@ "patchset", "1", "patch_storage", - "", + "rietveld", "--key", "arch", "x86_64", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index 1129a2cea4..9098ea7280 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -148,7 +148,7 @@ "patchset", "1", "patch_storage", - "", + "rietveld", "--svgs", "[SLAVE_BUILD]/svg", "--key", @@ -447,7 +447,7 @@ "patchset", "1", "patch_storage", - "" + "rietveld" ], "cwd": "[SLAVE_BUILD]/skia", "env": { diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index 131ad96e3b..d54b9c6a74 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -200,7 +200,7 @@ "patchset", "1", "patch_storage", - "", + "rietveld", "--svgs", "[SLAVE_BUILD]\\svg", "--key", diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index 2efd0e83ac..708f6b3fbd 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -200,7 +200,7 @@ "patchset", "1", "patch_storage", - "", + "rietveld", "--svgs", "[SLAVE_BUILD]\\svg", "--key",