diff --git a/buildbot/master/files/config/factories.py b/buildbot/master/files/config/factories.py index 277f4685..38a2b7ae 100644 --- a/buildbot/master/files/config/factories.py +++ b/buildbot/master/files/config/factories.py @@ -25,8 +25,10 @@ def __init__(self, build_steps): Prefer using DynamicServoFactory to using this class directly. """ all_steps = [ - steps.Git(repourl=SERVO_REPO, - mode="full", method="fresh", retryFetch=True), + steps.Git( + repourl=SERVO_REPO, + mode="full", method="fresh", retryFetch=True + ), ] + build_steps # util.BuildFactory is an old-style class so we cannot use super() # but must hardcode the superclass here @@ -76,8 +78,9 @@ def run(self): else: builder_steps = yaml.safe_load(cmd.stdout) commands = builder_steps[self.builder_name] - dynamic_steps = [self.make_step(command) - for command in commands] + dynamic_steps = [ + self.make_step(command) for command in commands + ] except Exception as e: # Bad step configuration, fail build # Capture the exception and re-raise with a friendly message raise Exception("Bad step configuration for {}: {}".format( @@ -192,6 +195,11 @@ def make_step(self, command): r'C:\Program Files\Amazon\cfn-bootstrap', ]) + # Set token for homebrew repository + elif arg == './etc/ci/update_brew.sh': + step_kwargs['logEnviron'] = False + step_env += envs.update_brew + else: step_desc += [arg]