Include "revision" tag for all Swarming tasks
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2186993002
Review-Url: https://codereview.chromium.org/2186993002
diff --git a/infra/bots/recipe_modules/skia_swarming/__init__.py b/infra/bots/recipe_modules/skia_swarming/__init__.py
index 7805136..f87a628 100644
--- a/infra/bots/recipe_modules/skia_swarming/__init__.py
+++ b/infra/bots/recipe_modules/skia_swarming/__init__.py
@@ -9,6 +9,7 @@
'build/swarming_client',
'recipe_engine/json',
'recipe_engine/path',
+ 'recipe_engine/properties',
'recipe_engine/python',
'recipe_engine/raw_io',
'recipe_engine/step',
diff --git a/infra/bots/recipe_modules/skia_swarming/api.py b/infra/bots/recipe_modules/skia_swarming/api.py
index e5f05b1..6993b9d 100644
--- a/infra/bots/recipe_modules/skia_swarming/api.py
+++ b/infra/bots/recipe_modules/skia_swarming/api.py
@@ -223,6 +223,9 @@
io_timeout if io_timeout else DEFAULT_IO_TIMEOUT)
if extra_args:
swarming_task.extra_args = extra_args
+ revision = self.m.properties.get('revision')
+ if revision:
+ swarming_task.tags.add('revision:%s' % revision)
swarming_tasks.append(swarming_task)
step_results = self.m.swarming.trigger(swarming_tasks)
for step_result in step_results:
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
index 13161ba..6c21794 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
@@ -361,6 +361,8 @@
"--tag",
"os:Mac",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Mac",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
index 0c8e0cb..c6b25f4 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan.json
@@ -371,6 +371,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
index 23f6913..7ccdb03 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug.json
@@ -359,6 +359,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json
index 82055b0..a785a9c 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-RemoteRun.json
@@ -360,6 +360,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json
index 30478ec..9afd645 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Trybot.json
@@ -359,6 +359,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"rietveld:https://codereview.chromium.org/500/#ps1",
"--tag",
"slavename:skiabot-linux-swarm-000",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
index 15216ae..11a12d5 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json
@@ -380,6 +380,8 @@
"--tag",
"os:Windows",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Windows",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json
index 48a23bf..a6d2e28 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Build-Win-MSVC-x86_64-Release.json
@@ -369,6 +369,8 @@
"--tag",
"os:Windows",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Windows",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
index c70fba4..0a08f6a 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
@@ -357,6 +357,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:RecreateSKPs_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
index 1e1d5e0..939baac 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
@@ -398,6 +398,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
@@ -632,6 +634,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:housekeeper_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json b/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
index d1ad751..cc40f29 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Infra-PerCommit.json
@@ -318,6 +318,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:infra_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
index 1fdfa8b..14694da 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json
@@ -403,6 +403,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"rietveld:https://codereview.chromium.org/500/#ps1",
"--tag",
"slavename:skiabot-linux-swarm-000",
@@ -665,6 +667,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"rietveld:https://codereview.chromium.org/500/#ps1",
"--tag",
"slavename:skiabot-linux-swarm-000",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
index 3aadb90..dadc06d 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan.json
@@ -419,6 +419,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
@@ -675,6 +677,8 @@
"--tag",
"os:Android",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Android",
@@ -852,6 +856,8 @@
"--tag",
"os:Android",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:perf_skia on Android",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
index abe5691..5dfed43 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Android-GCC-Nexus7v2-GPU-Tegra3-Arm7-Release.json
@@ -417,6 +417,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
@@ -673,6 +675,8 @@
"--tag",
"os:Android",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Android",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
index a70034c..fb501e0 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
@@ -407,6 +407,8 @@
"--tag",
"os:Mac",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Mac",
@@ -664,6 +666,8 @@
"--tag",
"os:Mac",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Mac",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index c1f03dc..84d9186 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -388,6 +388,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"rietveld:https://codereview.chromium.org/500/#ps1",
"--tag",
"slavename:skiabot-linux-swarm-000",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 6703954..407d3a7 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -407,6 +407,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
@@ -664,6 +666,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Ubuntu",
@@ -844,6 +848,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:perf_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index 84f6f94..68f8b65 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -404,6 +404,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
@@ -661,6 +663,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Ubuntu",
@@ -841,6 +845,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:perf_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index 8949288..3d7dd6e 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -406,6 +406,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Ubuntu",
@@ -660,6 +662,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Ubuntu",
@@ -837,6 +841,8 @@
"--tag",
"os:Ubuntu",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:perf_skia on Ubuntu",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
index 2babaf1..dabcefc 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release.json
@@ -413,6 +413,8 @@
"--tag",
"os:Windows",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Windows",
@@ -669,6 +671,8 @@
"--tag",
"os:Windows",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Windows",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
index 865fd01..5e093bc 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release.json
@@ -413,6 +413,8 @@
"--tag",
"os:Windows",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Windows",
@@ -672,6 +674,8 @@
"--tag",
"os:Windows-2008ServerR2-SP1",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on Windows-2008ServerR2-SP1",
diff --git a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
index b749dea..e806e37 100644
--- a/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
+++ b/infra/bots/recipes/swarm_trigger.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release.json
@@ -409,6 +409,8 @@
"--tag",
"os:Mac",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:compile_skia on Mac",
@@ -663,6 +665,8 @@
"--tag",
"os:iOS-9.2",
"--tag",
+ "revision:abc123",
+ "--tag",
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:test_skia on iOS-9.2",