This is an automated email from the ASF dual-hosted git repository. aonishuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 78f54fe3dbc0f59dbdf514fa9174549c89195be5 Author: Andrew Onishuk <[email protected]> AuthorDate: Tue Aug 28 14:54:24 2018 +0300 AMBARI-24543. Client installs failing with Ambari-2.7.0.0 on Ubuntu14 (aonishuk) --- .../src/main/python/ambari_agent/PythonExecutor.py | 1 + .../before-INSTALL/test_before_install.py | 23 ++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py b/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py index 8346f7c..73088ce 100644 --- a/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py +++ b/ambari-agent/src/main/python/ambari_agent/PythonExecutor.py @@ -31,6 +31,7 @@ from ambari_commons import shell from Grep import Grep from BackgroundCommandExecutionHandle import BackgroundCommandExecutionHandle +from resource_management.libraries.functions.log_process_information import log_process_information class PythonExecutor(object): diff --git a/ambari-server/src/test/python/stacks/stack-hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/stack-hooks/before-INSTALL/test_before_install.py index 37ac094..b3d9f8f 100644 --- a/ambari-server/src/test/python/stacks/stack-hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/stack-hooks/before-INSTALL/test_before_install.py @@ -36,32 +36,32 @@ class TestHookBeforeInstall(RMFTestCase): config_file="default.json" ) self.assertResourceCalled('Repository', 'HDP-2.6-repo-1', - append_to_file = False, base_url = 'http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60', - action = ['create'], + action = ['prepare'], components = [u'HDP', 'main'], repo_template = '[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %}\n\npath=/\nenabled=1\ngpgcheck=0', repo_file_name = None, mirror_list = None, ) self.assertResourceCalled('Repository', 'HDP-2.6-GPL-repo-1', - append_to_file = True, base_url = 'http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60', - action = ['create'], + action = ['prepare'], components = [u'HDP-GPL', 'main'], repo_template = '[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %}\n\npath=/\nenabled=1\ngpgcheck=0', repo_file_name = None, mirror_list = None, ) self.assertResourceCalled('Repository', 'HDP-UTILS-1.1.0.22-repo-1', - append_to_file = True, base_url = 'http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6', - action = ['create'], + action = ['prepare'], components = [u'HDP-UTILS', 'main'], repo_template = '[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %}\n\npath=/\nenabled=1\ngpgcheck=0', repo_file_name = None, mirror_list = None, ) + self.assertResourceCalled('Repository', None, + action=['create'], + ) self.assertResourceCalled('Package', 'unzip', retry_count=5, retry_on_repo_unavailability=False) self.assertResourceCalled('Package', 'curl', retry_count=5, retry_on_repo_unavailability=False) @@ -95,22 +95,25 @@ class TestHookBeforeInstall(RMFTestCase): config_file="repository_file.json" ) self.assertResourceCalled('Repository', 'HDP-2.2-repo-4', - action=['create'], + action=['prepare'], base_url='http://repo1/HDP/centos5/2.x/updates/2.2.0.0', components=['HDP', 'main'], mirror_list=None, repo_file_name='ambari-hdp-4', repo_template='[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %}\n\npath=/\nenabled=1\ngpgcheck=0', - append_to_file=False) + ) self.assertResourceCalled('Repository', 'HDP-UTILS-1.1.0.20-repo-4', - action=['create'], + action=['prepare'], base_url='http://repo1/HDP-UTILS/centos5/2.x/updates/2.2.0.0', components=['HDP-UTILS', 'main'], mirror_list=None, repo_file_name='ambari-hdp-4', repo_template='[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif %}\n\npath=/\nenabled=1\ngpgcheck=0', - append_to_file=True) + ) + self.assertResourceCalled('Repository', None, + action=['create'], + ) self.assertResourceCalled('Package', 'unzip', retry_count=5, retry_on_repo_unavailability=False) self.assertResourceCalled('Package', 'curl', retry_count=5, retry_on_repo_unavailability=False)
