diff options
| author | David James <davidjames@google.com> | 2014-09-04 18:04:54 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-24 19:18:37 +0000 |
| commit | dc6ff5b5d1195328b77af9edee9a2c32b8341a1f (patch) | |
| tree | e71c3e5450143f5d9a4642a89cf886e4fb404e74 /cbuildbot/stages/sdk_stages.py | |
| parent | a15b5073e3f0d54d7584152763c14f59ee16bd73 (diff) | |
| download | chromite-dc6ff5b5d1195328b77af9edee9a2c32b8341a1f.tar.gz | |
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 <davidjames@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Diffstat (limited to 'cbuildbot/stages/sdk_stages.py')
| -rw-r--r-- | cbuildbot/stages/sdk_stages.py | 26 |
1 files changed, 16 insertions, 10 deletions
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) |