Merge "Don't download fedora-user as part of --all build"

This commit is contained in:
Jenkins 2015-10-21 07:12:32 +00:00 committed by Gerrit Code Review
commit 5c4bd5a81c
2 changed files with 0 additions and 2 deletions

View File

@ -54,7 +54,6 @@ class TestOvercloudImageBuild(TestPluginV1):
self.assertEqual(1, self.mock_ramdisk_image_create.call_count) self.assertEqual(1, self.mock_ramdisk_image_create.call_count)
self.assertEqual(2, self.mock_disk_image_create.call_count) self.assertEqual(2, self.mock_disk_image_create.call_count)
self.assertEqual(1, mock_fedora_user.call_count)
@mock.patch('subprocess.call', autospec=True) @mock.patch('subprocess.call', autospec=True)
@mock.patch('os.path.isfile', autospec=True) @mock.patch('os.path.isfile', autospec=True)

View File

@ -508,7 +508,6 @@ class BuildOvercloudImage(command.Command):
self._build_image_ramdisk_deploy(parsed_args) self._build_image_ramdisk_deploy(parsed_args)
self._build_image_ramdisk_agent(parsed_args) self._build_image_ramdisk_agent(parsed_args)
self._build_image_overcloud_full(parsed_args) self._build_image_overcloud_full(parsed_args)
self._build_image_fedora_user(parsed_args)
else: else:
for image_type in parsed_args.image_types: for image_type in parsed_args.image_types:
{ {