diff options
Diffstat (limited to 'ci/ciimage/build.py')
| -rwxr-xr-x | ci/ciimage/build.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/ciimage/build.py b/ci/ciimage/build.py index 5e25e36..f57e8d7 100755 --- a/ci/ciimage/build.py +++ b/ci/ciimage/build.py @@ -26,6 +26,7 @@ class ImageDef: assert isinstance(data['env'], dict) self.base_image: str = data['base_image'] + self.args: T.List[str] = data.get('args', []) self.env: T.Dict[str, str] = data['env'] class BuilderBase(): @@ -64,6 +65,9 @@ class Builder(BuilderBase): out_file = self.temp_dir / 'env_vars.sh' out_data = '' + # run_tests.py parameters + self.image_def.env['CI_ARGS'] = ' '.join(self.image_def.args) + for key, val in self.image_def.env.items(): out_data += f'export {key}="{val}"\n' @@ -153,7 +157,7 @@ class ImageTester(BuilderBase): test_cmd = [ self.docker, 'run', '--rm', '-t', 'meson_test_image', - '/usr/bin/bash', '-c', 'source /ci/env_vars.sh; cd meson; ./run_tests.py' + '/usr/bin/bash', '-c', 'source /ci/env_vars.sh; cd meson; ./run_tests.py $CI_ARGS' ] if subprocess.run(test_cmd).returncode != 0: raise RuntimeError('Running tests failed') |