AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] fix recipe bug

Browse Source 
We shouldn't modify self.m.vars.extra_tokens in the docker flavor.

I noticed this when doing some debugging. It doesn't seem to be causing
any problems currently.

Change-Id: I2239787f8aec8a25a6a26418c633e68840f74e04
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271058
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Ben Wagner 2020-02-14 16:04:35 -05:00 committed by Skia Commit-Bot
parent 4af17e434c
commit 78b471760d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infra/bots/recipe_modules/flavor/docker.py
View File

@ -39,8 +39,7 @@ class DockerFlavor(default.DefaultFlavor):
return None
def step(self, name, cmd, **unused_kwargs):
extra_tokens = self.m.vars.extra_tokens
extra_tokens.remove('Docker')
extra_tokens = [t for t in self.m.vars.extra_tokens if t != 'Docker']
os = self.m.vars.builder_cfg.get('os', '')
model = self.m.vars.builder_cfg.get('model', '')
cpu_or_gpu = self.m.vars.builder_cfg.get('cpu_or_gpu', '')