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

Unified Diff: appengine/swarming/handlers_bot.py

Issue 1939343002: swarming: change meaning of inputs_ref (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master
Patch Set: nit Created 4 years, 8 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/server/task_request.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 e8f9256baa3f91e93e10e8df62e91926f0cf4ecc..d73230fb790ce9b19dea4851f1d2bee94e7207a8 100644
--- a/appengine/swarming/handlers_bot.py
+++ b/appengine/swarming/handlers_bot.py
@@ -379,6 +379,21 @@ class BotPollHandler(_BotBaseHandler):
cmd = request.properties.commands[0]
elif request.properties.command:
cmd = request.properties.command
+
+ isolated = None
+ if request.properties.inputs_ref:
+ isolated = {
+ 'input': request.properties.inputs_ref.isolated,
+ 'server': request.properties.inputs_ref.isolatedserver,
+ 'namespace': request.properties.inputs_ref.namespace,
+ }
+ elif request.properties.outputs_target:
+ isolated = {
+ 'input': None,
+ 'server': request.properties.inputs_ref.isolatedserver,
+ 'namespace': request.properties.inputs_ref.namespace,
+ }
+
out = {
'cmd': 'run',
'manifest': {
@@ -391,7 +406,7 @@ class BotPollHandler(_BotBaseHandler):
'hard_timeout': request.properties.execution_timeout_secs,
'host': utils.get_versioned_hosturl(),
'io_timeout': request.properties.io_timeout_secs,
- 'inputs_ref': request.properties.inputs_ref,
+ 'isolated': isolated,
'packages': [
{
'package_name': p.package_name,
« no previous file with comments | « no previous file | appengine/swarming/handlers_bot_test.py » ('j') | appengine/swarming/server/task_request.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698