Don't build image upload tasks when dry_run is True
It seems redundant to build upload tasks when dry-run flag is True with image push. Change-Id: Iede9c498478c9249ce915258f2df496a52f3fc91
This commit is contained in:
parent
503bc32b44
commit
094bbc657c
|
@ -149,7 +149,6 @@ class TestContainerImagePush(TestPluginV1):
|
||||||
append_tag=parsed_args.append_tag,
|
append_tag=parsed_args.append_tag,
|
||||||
modify_role=None,
|
modify_role=None,
|
||||||
modify_vars=None,
|
modify_vars=None,
|
||||||
dry_run=parsed_args.dry_run,
|
|
||||||
cleanup=False,
|
cleanup=False,
|
||||||
multi_arch=parsed_args.multi_arch)
|
multi_arch=parsed_args.multi_arch)
|
||||||
|
|
||||||
|
@ -202,7 +201,6 @@ class TestContainerImagePush(TestPluginV1):
|
||||||
append_tag=parsed_args.append_tag,
|
append_tag=parsed_args.append_tag,
|
||||||
modify_role=None,
|
modify_role=None,
|
||||||
modify_vars=None,
|
modify_vars=None,
|
||||||
dry_run=parsed_args.dry_run,
|
|
||||||
cleanup=False,
|
cleanup=False,
|
||||||
multi_arch=parsed_args.multi_arch)
|
multi_arch=parsed_args.multi_arch)
|
||||||
|
|
||||||
|
@ -255,7 +253,6 @@ class TestContainerImagePush(TestPluginV1):
|
||||||
append_tag=parsed_args.append_tag,
|
append_tag=parsed_args.append_tag,
|
||||||
modify_role=None,
|
modify_role=None,
|
||||||
modify_vars=None,
|
modify_vars=None,
|
||||||
dry_run=parsed_args.dry_run,
|
|
||||||
cleanup=False,
|
cleanup=False,
|
||||||
multi_arch=parsed_args.multi_arch)
|
multi_arch=parsed_args.multi_arch)
|
||||||
|
|
||||||
|
@ -367,19 +364,9 @@ class TestContainerImagePush(TestPluginV1):
|
||||||
parsed_args.password)]
|
parsed_args.password)]
|
||||||
mock_uploader.authenticate.assert_has_calls(auth_calls)
|
mock_uploader.authenticate.assert_has_calls(auth_calls)
|
||||||
|
|
||||||
mock_task.assert_called_once_with(
|
mock_task.assert_not_called()
|
||||||
image_name='namespace/foo:tag',
|
mock_add_upload.assert_not_called()
|
||||||
pull_source='docker.io',
|
mock_run_tasks.assert_not_called()
|
||||||
push_destination='127.0.0.1:8787',
|
|
||||||
append_tag=parsed_args.append_tag,
|
|
||||||
modify_role=None,
|
|
||||||
modify_vars=None,
|
|
||||||
dry_run=parsed_args.dry_run,
|
|
||||||
cleanup=True,
|
|
||||||
multi_arch=parsed_args.multi_arch)
|
|
||||||
|
|
||||||
mock_add_upload.assert_called_once_with(mock_uploadtask)
|
|
||||||
mock_run_tasks.assert_called_once()
|
|
||||||
|
|
||||||
|
|
||||||
class TestContainerImageDelete(TestPluginV1):
|
class TestContainerImageDelete(TestPluginV1):
|
||||||
|
|
|
@ -684,7 +684,8 @@ class TripleOContainerImagePush(command.Command):
|
||||||
session = uploader.authenticate(reg_url,
|
session = uploader.authenticate(reg_url,
|
||||||
parsed_args.username,
|
parsed_args.username,
|
||||||
parsed_args.password)
|
parsed_args.password)
|
||||||
|
try:
|
||||||
|
if not parsed_args.dry_run:
|
||||||
task = image_uploader.UploadTask(
|
task = image_uploader.UploadTask(
|
||||||
image_name=image_name,
|
image_name=image_name,
|
||||||
pull_source=image_source,
|
pull_source=image_source,
|
||||||
|
@ -692,10 +693,9 @@ class TripleOContainerImagePush(command.Command):
|
||||||
append_tag=parsed_args.append_tag,
|
append_tag=parsed_args.append_tag,
|
||||||
modify_role=None,
|
modify_role=None,
|
||||||
modify_vars=None,
|
modify_vars=None,
|
||||||
dry_run=parsed_args.dry_run,
|
|
||||||
cleanup=parsed_args.cleanup,
|
cleanup=parsed_args.cleanup,
|
||||||
multi_arch=parsed_args.multi_arch)
|
multi_arch=parsed_args.multi_arch)
|
||||||
try:
|
|
||||||
uploader.add_upload_task(task)
|
uploader.add_upload_task(task)
|
||||||
uploader.run_tasks()
|
uploader.run_tasks()
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
|
|
Loading…
Reference in New Issue