From dc6ff5b5d1195328b77af9edee9a2c32b8341a1f Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 4 Sep 2014 18:04:54 -0700 Subject: Pass in environment variables correctly in SDKTest stage. Currently, environment variables are dropped when calling build_packages inside the SDKTest stage. This is because we call build_packages like this: FOO=bar cros_sdk -- build_packages Tell cros_sdk what variables we want so as to make it work again. cros_sdk FOO=bar -- build_packages BUG=chromium:406535 TEST=chromiumos-sdk builder, unit tests Change-Id: Ie30c163a76281dcbf9fcf15c4c3fe1bc11959bbc Reviewed-on: https://chromium-review.googlesource.com/216528 Reviewed-by: David James Commit-Queue: David James Tested-by: David James --- cbuildbot/stages/sdk_stages.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'cbuildbot/stages/sdk_stages.py') diff --git a/cbuildbot/stages/sdk_stages.py b/cbuildbot/stages/sdk_stages.py index 007f3a531..ed1d9ea96 100644 --- a/cbuildbot/stages/sdk_stages.py +++ b/cbuildbot/stages/sdk_stages.py @@ -109,19 +109,25 @@ class SDKTestStage(generic_stages.BuilderStage): def PerformStage(self): tarball_location = os.path.join(self._build_root, 'built-sdk.tar.xz') - new_chroot_cmd = ['cros_sdk', '--chroot', 'new-sdk-chroot'] + new_chroot_args = ['--chroot', 'new-sdk-chroot'] + if self._run.options.chrome_root: + new_chroot_args += ['--chrome_root', self._run.options.chrome_root] + # Build a new SDK using the provided tarball. - cmd = new_chroot_cmd + ['--download', '--replace', '--nousepkg', + chroot_args = new_chroot_args + ['--download', '--replace', '--nousepkg', '--url', 'file://' + tarball_location] - cros_build_lib.RunCommand(cmd, cwd=self._build_root, - extra_env=self._portage_extra_env) + cros_build_lib.RunCommand( + [], cwd=self._build_root, enter_chroot=True, chroot_args=chroot_args, + extra_env=self._portage_extra_env) for board in self._boards: cros_build_lib.PrintBuildbotStepText(board) - cmd = new_chroot_cmd + ['--', './setup_board', - '--board', board, '--skip_chroot_upgrade'] - cros_build_lib.RunCommand(cmd, cwd=self._build_root) - cmd = new_chroot_cmd + ['--', './build_packages', - '--board', board, '--nousepkg', '--skip_chroot_upgrade'] - cros_build_lib.RunCommand(cmd, cwd=self._build_root, + cmd = ['./setup_board', '--board', board, '--skip_chroot_upgrade'] + cros_build_lib.RunCommand( + cmd, cwd=self._build_root, enter_chroot=True, + chroot_args=new_chroot_args, extra_env=self._portage_extra_env) + cmd = ['./build_packages', '--board', board, '--nousepkg', + '--skip_chroot_upgrade'] + cros_build_lib.RunCommand(cmd, cwd=self._build_root, enter_chroot=True, + chroot_args=new_chroot_args, extra_env=self._portage_extra_env) -- cgit v1.2.3