diff options
| author |   Stamatis Katsaounis <mokats@intracom-telecom.com> | 2019-03-14 15:00:05 +0200 |
|---|---|---|
| committer | Stamatis Katsaounis <mokats@intracom-telecom.com> | 2019-03-20 07:55:37 +0000 |
| commit | f27b1382a87c432487816cfad6e5c341250d16b2 (patch) | |
| tree | 31c4adf47b4073c0f4e9ed639afeca55a553fd49 /dovetail | |
| parent | ef2d5282306a277e591aa3c355277c6f158d8e76 (diff) | |
Improve Dockerfile
This patch improves the Dockerfile which produces the Dovetail image.
Change-Id: I65e65f155afe237b11c668e6486e48b55cc7e96c
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Diffstat (limited to 'dovetail')
| -rwxr-xr-x | dovetail/run.py | 6 | ||||
| -rw-r--r-- | dovetail/tests/unit/test_run.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index f538b86c..71a69687 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -128,7 +128,7 @@ def clean_results_dir(): result_path = dt_cfg.dovetail_config['result_dir'] if os.path.exists(result_path): if os.path.isdir(result_path): - cmd = 'sudo rm -rf %s/*' % (result_path) + cmd = 'rm -rf %s/*' % (result_path) dt_utils.exec_cmd(cmd, exit_on_error=False, exec_msg_on=False) else: print('result_dir in dovetail_config.yml is not a directory.') @@ -160,7 +160,7 @@ def copy_userconfig_files(logger): userconfig_path = dt_cfg.dovetail_config['userconfig_dir'] if not os.path.isdir(userconfig_path): os.makedirs(userconfig_path) - cmd = 'sudo cp -r %s/* %s' % (constants.USERCONF_PATH, userconfig_path) + cmd = 'cp -r %s/* %s' % (constants.USERCONF_PATH, userconfig_path) dt_utils.exec_cmd(cmd, logger, exit_on_error=False) @@ -168,7 +168,7 @@ def copy_patch_files(logger): patch_set_path = dt_cfg.dovetail_config['patch_dir'] if not os.path.isdir(patch_set_path): os.makedirs(patch_set_path) - cmd = 'sudo cp -a -r %s/* %s' % (constants.PATCH_PATH, patch_set_path) + cmd = 'cp -a -r %s/* %s' % (constants.PATCH_PATH, patch_set_path) dt_utils.exec_cmd(cmd, logger, exit_on_error=False) diff --git a/dovetail/tests/unit/test_run.py b/dovetail/tests/unit/test_run.py index 80b5eca6..7f36d31f 100644 --- a/dovetail/tests/unit/test_run.py +++ b/dovetail/tests/unit/test_run.py @@ -233,7 +233,7 @@ class RunTesting(unittest.TestCase): mock_os.path.exists.assert_called_once_with('value') mock_os.path.isdir.assert_called_once_with('value') mock_utils.exec_cmd.assert_called_once_with( - 'sudo rm -rf value/*', exit_on_error=False, exec_msg_on=False) + 'rm -rf value/*', exit_on_error=False, exec_msg_on=False) @patch('dovetail.run.dt_utils') @patch('dovetail.run.dt_cfg') @@ -302,7 +302,7 @@ class RunTesting(unittest.TestCase): mock_os.path.isdir.assert_called_once_with('value') mock_os.makedirs.assert_called_once_with('value') mock_utils.exec_cmd.assert_called_once_with( - 'sudo cp -r value/* value', logger, exit_on_error=False) + 'cp -r value/* value', logger, exit_on_error=False) @patch('dovetail.run.constants') @patch('dovetail.run.dt_cfg') @@ -320,7 +320,7 @@ class RunTesting(unittest.TestCase): mock_os.path.isdir.assert_called_once_with('value') mock_os.makedirs.assert_called_once_with('value') mock_utils.exec_cmd.assert_called_once_with( - 'sudo cp -a -r value/* value', logger, exit_on_error=False) + 'cp -a -r value/* value', logger, exit_on_error=False) @patch('dovetail.run.os') def test_update_deploy_scenario(self, mock_os): |