Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1877)

Unified Diff: appengine/swarming/handlers_bot.py

Issue 2267363004: Add CIPD pin reporting to swarming. (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master
Patch Set: comments and some tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | appengine/swarming/handlers_bot_test.py » ('j') | appengine/swarming/message_conversion.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: appengine/swarming/handlers_bot.py
diff --git a/appengine/swarming/handlers_bot.py b/appengine/swarming/handlers_bot.py
index 9363867453f0a309551f0da45abc831f4da515b8..d986f25a5fd0051a07a78a917f30d3e9c0679bf0 100644
--- a/appengine/swarming/handlers_bot.py
+++ b/appengine/swarming/handlers_bot.py
@@ -629,9 +629,9 @@ class BotTaskUpdateHandler(_BotApiHandler):
out-of-order packets.
"""
ACCEPTED_KEYS = {
- u'bot_overhead', u'cipd_stats', u'cost_usd', u'duration', u'exit_code',
- u'hard_timeout', u'id', u'io_timeout', u'isolated_stats', u'output',
- u'output_chunk_start', u'outputs_ref', u'task_id',
+ u'bot_overhead', u'cipd_pins', u'cipd_stats', u'cost_usd', u'duration',
+ u'exit_code', u'hard_timeout', u'id', u'io_timeout', u'isolated_stats',
+ u'output', u'output_chunk_start', u'outputs_ref', u'task_id',
}
REQUIRED_KEYS = {u'id', u'task_id'}
@@ -654,13 +654,14 @@ class BotTaskUpdateHandler(_BotApiHandler):
bot_auth.validate_bot_id_and_fetch_config(bot_id)
bot_overhead = request.get('bot_overhead')
+ cipd_pins = request.get('cipd_pins')
+ cipd_stats = request.get('cipd_stats')
cost_usd = request.get('cost_usd', 0)
duration = request.get('duration')
exit_code = request.get('exit_code')
hard_timeout = request.get('hard_timeout')
io_timeout = request.get('io_timeout')
isolated_stats = request.get('isolated_stats')
- cipd_stats = request.get('cipd_stats')
output = request.get('output')
output_chunk_start = request.get('output_chunk_start')
outputs_ref = request.get('outputs_ref')
@@ -717,6 +718,9 @@ class BotTaskUpdateHandler(_BotApiHandler):
if outputs_ref:
outputs_ref = task_request.FilesRef(**outputs_ref)
+ if cipd_pins:
+ cipd_pins = [task_request.CipdPackage(**pin) for pin in cipd_pins]
+
try:
state = task_scheduler.bot_update_task(
run_result_key=run_result_key,
@@ -729,6 +733,7 @@ class BotTaskUpdateHandler(_BotApiHandler):
io_timeout=io_timeout,
cost_usd=cost_usd,
outputs_ref=outputs_ref,
+ cipd_pins=cipd_pins,
performance_stats=performance_stats)
if not state:
logging.info('Failed to update, please retry')
« no previous file with comments | « no previous file | appengine/swarming/handlers_bot_test.py » ('j') | appengine/swarming/message_conversion.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698