rework buildbot

Change-Id: Ie7a614b000703a76319df159b037726b0b85726e