openstack
/
fuel-plugins
Code Issues Proposed changes

Merge "Support multi versions of package in fuel plugin"

This commit is contained in:
Jenkins 2016-08-31 13:14:35 +00:00 committed by Gerrit Code Review
parent dd03155047 a3f9289478
commit e4bf931839
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuel_plugin_builder/actions/build.py
View File

@ -102,7 +102,7 @@ class BaseBuildPlugin(BaseAction):
def build_ubuntu_repos(cls, releases_paths): def build_ubuntu_repos(cls, releases_paths):
for repo_path in releases_paths: for repo_path in releases_paths:
utils.exec_piped_cmds( utils.exec_piped_cmds(
['dpkg-scanpackages .', 'gzip -c9 > Packages.gz'], ['dpkg-scanpackages -m .', 'gzip -c9 > Packages.gz'],
cwd=repo_path) cwd=repo_path)
@classmethod @classmethod
@ -226,7 +226,7 @@ class BuildPluginV2(BaseBuildPlugin):
def build_ubuntu_repos(self, releases_paths): def build_ubuntu_repos(self, releases_paths):
for repo_path in releases_paths: for repo_path in releases_paths:
utils.exec_piped_cmds( utils.exec_piped_cmds(
['dpkg-scanpackages .', 'gzip -c9 > Packages.gz'], ['dpkg-scanpackages -m .', 'gzip -c9 > Packages.gz'],
cwd=repo_path) cwd=repo_path)
release_path = join_path(repo_path, 'Release') release_path = join_path(repo_path, 'Release')
utils.render_to_file( utils.render_to_file(

4
fuel_plugin_builder/tests/test_build.py
View File

@ -106,7 +106,7 @@ class BaseBuild(BaseTestCase):
path = '/repo/path' path = '/repo/path'
self.builder.build_ubuntu_repos([path]) self.builder.build_ubuntu_repos([path])
utils_mock.exec_piped_cmds.assert_called_once_with( utils_mock.exec_piped_cmds.assert_called_once_with(
['dpkg-scanpackages .', 'gzip -c9 > Packages.gz'], ['dpkg-scanpackages -m .', 'gzip -c9 > Packages.gz'],
cwd=path) cwd=path)
@mock.patch('fuel_plugin_builder.actions.build.utils') @mock.patch('fuel_plugin_builder.actions.build.utils')
@ -280,7 +280,7 @@ class TestBaseBuildV2(BaseBuild):
path = '/repo/path' path = '/repo/path'
self.builder.build_ubuntu_repos([path]) self.builder.build_ubuntu_repos([path])
utils_mock.exec_piped_cmds.assert_called_once_with( utils_mock.exec_piped_cmds.assert_called_once_with(
['dpkg-scanpackages .', 'gzip -c9 > Packages.gz'], ['dpkg-scanpackages -m .', 'gzip -c9 > Packages.gz'],
cwd=path) cwd=path)
release_src = os.path.abspath(join_path( release_src = os.path.abspath(join_path(
os.path.dirname(__file__), '..', os.path.dirname(__file__), '..',