Repository: ambari Updated Branches: refs/heads/trunk 8bed25926 -> 909407812
AMBARI-7012. HDP-artifacts tmp directory should not be used at all (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90940781 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90940781 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90940781 Branch: refs/heads/trunk Commit: 90940781212fbc8c87149bcad99d9292886d8d10 Parents: 8bed259 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Tue Aug 26 15:34:16 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Tue Aug 26 15:34:16 2014 +0300 ---------------------------------------------------------------------- .../main/resources/custom_actions/check_host.py | 7 +++-- .../1.3.2/hooks/before-ANY/scripts/params.py | 3 +- .../hooks/before-INSTALL/scripts/params.py | 2 +- .../services/HIVE/package/scripts/params.py | 2 +- .../2.0.6/hooks/before-ANY/scripts/params.py | 3 +- .../hooks/before-INSTALL/scripts/params.py | 2 +- .../services/HIVE/package/scripts/params.py | 2 +- ambari-server/src/test/python/TestCheckHost.py | 29 ++++++++++++-------- .../stacks/1.3.2/HIVE/test_hive_metastore.py | 4 +-- .../stacks/1.3.2/HIVE/test_hive_server.py | 4 +-- .../1.3.2/hooks/before-ANY/test_before_any.py | 6 ++-- .../hooks/before-INSTALL/test_before_install.py | 4 +-- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 4 +-- .../stacks/2.0.6/HIVE/test_hive_server.py | 4 +-- .../2.0.6/hooks/before-ANY/test_before_any.py | 6 ++-- .../hooks/before-INSTALL/test_before_install.py | 4 +-- .../stacks/2.1/HIVE/test_hive_metastore.py | 4 +-- 17 files changed, 50 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/custom_actions/check_host.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/check_host.py b/ambari-server/src/main/resources/custom_actions/check_host.py index 3543f96..8e9b222 100644 --- a/ambari-server/src/main/resources/custom_actions/check_host.py +++ b/ambari-server/src/main/resources/custom_actions/check_host.py @@ -46,6 +46,7 @@ JDBC_DRIVER_SYMLINK_POSTGRESQL = "postgres-jdbc-driver.jar" class CheckHost(Script): def actionexecute(self, env): config = Script.get_config() + tmp_dir = Script.get_tmp_dir() #print "CONFIG: " + str(config) @@ -64,7 +65,7 @@ class CheckHost(Script): if CHECK_DB_CONNECTION in check_execute_list: try : - db_connection_check_structured_output = self.execute_db_connection_check(config) + db_connection_check_structured_output = self.execute_db_connection_check(config, tmp_dir) structured_output[CHECK_DB_CONNECTION] = db_connection_check_structured_output except Exception, exception: print "There was an unknown error while checking database connectivity: " + str(exception) @@ -97,7 +98,7 @@ class CheckHost(Script): return java_home_check_structured_output - def execute_db_connection_check(self, config): + def execute_db_connection_check(self, config, tmp_dir): print "DB connection check started." # initialize needed data @@ -135,7 +136,7 @@ class CheckHost(Script): return db_connection_check_structured_output environment = { "no_proxy": format("{ambari_server_hostname}") } - artifact_dir = "/tmp/HDP-artifacts/" + artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") java_dir = os.path.dirname(java64_home) # download and install java if it doesn't exists http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py index c7b01d6..0c6a415 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py @@ -20,11 +20,12 @@ limitations under the License. from resource_management import * config = Script.get_config() +tmp_dir = Script.get_tmp_dir() _authentication = config['configurations']['core-site']['hadoop.security.authentication'] security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos') -artifact_dir = "/tmp/HDP-artifacts/" +artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") jce_policy_zip = default("/hostLevelParams/jce_name", None) # None when jdk is already installed by user jce_location = config['hostLevelParams']['jdk_location'] jdk_name = default("/hostLevelParams/jdk_name", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py index ce8f34b..2bcbd50 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/params.py @@ -25,7 +25,7 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() #java params -artifact_dir = "/tmp/HDP-artifacts/" +artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") jdk_name = default("/hostLevelParams/jdk_name", None) # None when jdk is already installed by user jce_policy_zip = default("/hostLevelParams/jce_name", None) # None when jdk is already installed by user jce_location = config['hostLevelParams']['jdk_location'] http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py index ef26418..7ae8db4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py @@ -91,7 +91,7 @@ driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}") hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] user_group = config['configurations']['hadoop-env']['user_group'] -artifact_dir = "/tmp/HDP-artifacts/" +artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") target = format("{hive_lib}/{jdbc_jar_name}") http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index c7b01d6..0c6a415 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -20,11 +20,12 @@ limitations under the License. from resource_management import * config = Script.get_config() +tmp_dir = Script.get_tmp_dir() _authentication = config['configurations']['core-site']['hadoop.security.authentication'] security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos') -artifact_dir = "/tmp/HDP-artifacts/" +artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") jce_policy_zip = default("/hostLevelParams/jce_name", None) # None when jdk is already installed by user jce_location = config['hostLevelParams']['jdk_location'] jdk_name = default("/hostLevelParams/jdk_name", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py index bb4ee71..f76cc33 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py @@ -100,7 +100,7 @@ security_enabled = ( not is_empty(_authentication) and _authentication == 'kerbe #java params java_home = config['hostLevelParams']['java_home'] -artifact_dir = "/tmp/HDP-artifacts/" +artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") jdk_name = default("/hostLevelParams/jdk_name", None) # None when jdk is already installed by user jce_policy_zip = default("/hostLevelParams/jce_name", None) # None when jdk is already installed by user jce_location = config['hostLevelParams']['jdk_location'] http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py index 8a82717..6cd173b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py @@ -95,7 +95,7 @@ driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}") hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] user_group = config['configurations']['hadoop-env']['user_group'] -artifact_dir = "/tmp/HDP-artifacts/" +artifact_dir = format("{tmp_dir}/AMBARI-artifacts/") target = format("{hive_lib}/{jdbc_jar_name}") http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/TestCheckHost.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestCheckHost.py b/ambari-server/src/test/python/TestCheckHost.py index c20f428..2f2a54a 100644 --- a/ambari-server/src/test/python/TestCheckHost.py +++ b/ambari-server/src/test/python/TestCheckHost.py @@ -32,10 +32,12 @@ class TestCheckHost(TestCase): @patch("os.path.isfile") @patch.object(Script, 'get_config') + @patch.object(Script, 'get_tmp_dir') @patch("resource_management.libraries.script.Script.put_structured_out") - def testJavaHomeAvailableCheck(self, structured_out_mock, mock_config, os_isfile_mock): + def testJavaHomeAvailableCheck(self, structured_out_mock, get_tmp_dir_mock, mock_config, os_isfile_mock): # test, java home exists os_isfile_mock.return_value = True + get_tmp_dir_mock.return_value = "/tmp" mock_config.return_value = {"commandParams" : {"check_execute_list" : "java_home_check", "java_home" : "test_java_home"}} @@ -57,12 +59,13 @@ class TestCheckHost(TestCase): @patch.object(Script, 'get_config') + @patch.object(Script, 'get_tmp_dir') @patch("check_host.Execute") @patch("resource_management.libraries.script.Script.put_structured_out") @patch("subprocess.Popen") @patch("check_host.format") @patch("os.path.isfile") - def testDBConnectionCheck(self, isfile_mock, format_mock, popenMock, structured_out_mock, execute_mock, mock_config): + def testDBConnectionCheck(self, isfile_mock, format_mock, popenMock, structured_out_mock, execute_mock, get_tmp_dir_mock, mock_config): # test, download DBConnectionVerification.jar failed mock_config.return_value = {"commandParams" : {"check_execute_list" : "db_connection_check", "java_home" : "test_java_home", @@ -73,7 +76,7 @@ class TestCheckHost(TestCase): "user_name" : "test_user_name", "user_passwd" : "test_user_passwd", "jdk_name" : "test_jdk_name"}} - + get_tmp_dir_mock.return_value = "/tmp" execute_mock.side_effect = Exception("test exception") isfile_mock.return_value = True checkHost = CheckHost() @@ -83,10 +86,10 @@ class TestCheckHost(TestCase): 'DBConnectionVerification.jar from Ambari Server resources. Check network access to Ambari ' \ 'Server.\ntest exception', 'exit_code': 1}}) - self.assertEquals(format_mock.call_args_list[1][0][0], "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf " \ + self.assertEquals(format_mock.call_args_list[2][0][0], "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf " \ "--retry 5 {jdk_location}{check_db_connection_jar_name} -o {check_db_connection_jar_name}'") - self.assertEquals(format_mock.call_args_list[2][0][0], "[ -f /usr/lib/ambari-agent/{check_db_connection_jar_name}]") + self.assertEquals(format_mock.call_args_list[3][0][0], "[ -f /usr/lib/ambari-agent/{check_db_connection_jar_name}]") # test, download jdbc driver failed mock_config.return_value = {"commandParams" : {"check_execute_list" : "db_connection_check", @@ -111,10 +114,10 @@ class TestCheckHost(TestCase): 'Server host to make the JDBC driver available for download and to enable testing ' 'the database connection.\n') self.assertEquals(structured_out_mock.call_args[0][0]['db_connection_check']['exit_code'], 1) - self.assertEquals(format_mock.call_args_list[3][0][0], "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf " \ + self.assertEquals(format_mock.call_args_list[4][0][0], "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf " \ "--retry 5 {jdbc_url} -o {jdbc_name}'") - self.assertEquals(format_mock.call_args_list[4][0][0], "[ -f /usr/lib/ambari-agent/{jdbc_name}]") + self.assertEquals(format_mock.call_args_list[5][0][0], "[ -f /usr/lib/ambari-agent/{jdbc_name}]") # test, no connection to remote db mock_config.return_value = {"commandParams" : {"check_execute_list" : "db_connection_check", @@ -172,8 +175,9 @@ class TestCheckHost(TestCase): @patch("socket.gethostbyname") @patch.object(Script, 'get_config') + @patch.object(Script, 'get_tmp_dir') @patch("resource_management.libraries.script.Script.put_structured_out") - def testHostResolution(self, structured_out_mock, mock_config, mock_socket): + def testHostResolution(self, structured_out_mock, get_tmp_dir_mock, mock_config, mock_socket): mock_socket.return_value = "192.168.1.1" jsonFilePath = os.path.join("../resources/custom_actions", "check_host_ip_addresses.json") @@ -181,7 +185,8 @@ class TestCheckHost(TestCase): jsonPayload = json.load(jsonFile) mock_config.return_value = ConfigDictionary(jsonPayload) - + get_tmp_dir_mock.return_value = "/tmp" + checkHost = CheckHost() checkHost.actionexecute(None) @@ -209,15 +214,17 @@ class TestCheckHost(TestCase): 'failed_count': 5, 'success_count': 0, 'exit_code': 0}}) @patch.object(Script, 'get_config') + @patch.object(Script, 'get_tmp_dir') @patch("resource_management.libraries.script.Script.put_structured_out") - def testInvalidCheck(self, structured_out_mock, mock_config): + def testInvalidCheck(self, structured_out_mock, get_tmp_dir_mock, mock_config): jsonFilePath = os.path.join("../resources/custom_actions", "invalid_check.json") with open(jsonFilePath, "r") as jsonFile: jsonPayload = json.load(jsonFile) mock_config.return_value = ConfigDictionary(jsonPayload) - + get_tmp_dir_mock.return_value = "tmp" + checkHost = CheckHost() checkHost.actionexecute(None) http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py index 1fbe8ec..fc8392d 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py @@ -159,7 +159,7 @@ class TestHiveMetastore(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', @@ -218,7 +218,7 @@ class TestHiveMetastore(RMFTestCase): ) def assert_configure_secured(self): - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py index 24cb274..a92df36 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py @@ -205,7 +205,7 @@ class TestHiveServer(RMFTestCase): kinit_path_local = "/usr/bin/kinit", action = ['create'], ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', @@ -292,7 +292,7 @@ class TestHiveServer(RMFTestCase): kinit_path_local = '/usr/bin/kinit', action = ['create'], ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/1.3.2/hooks/before-ANY/test_before_any.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-ANY/test_before_any.py index fe623a5..bdf0fa4 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-ANY/test_before_any.py +++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-ANY/test_before_any.py @@ -30,10 +30,10 @@ class TestHookBeforeInstall(RMFTestCase): command="hook", config_file="default.json" ) - self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/; curl -kf -x "" --retry 10 http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /tmp/HDP-artifacts//UnlimitedJCEPolicyJDK7.zip', + self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/; curl -kf -x "" --retry 10 http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', environment = {'no_proxy': 'c6401.ambari.apache.org'}, - not_if = 'test -e /tmp/HDP-artifacts//UnlimitedJCEPolicyJDK7.zip', + not_if = 'test -e /tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', ignore_failures = True, path = ['/bin', '/usr/bin/'], ) - self.assertNoMoreResources() \ No newline at end of file + self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py index 653b47c..25f85e9 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py @@ -38,12 +38,12 @@ class TestHookBeforeInstall(RMFTestCase): repo_file_name='HDP', repo_template='repo_suse_rhel.j2' ) - self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz', + self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], environment = {'no_proxy': 'c6401.ambari.apache.org'} ) - self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz > /dev/null 2>&1', + self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz > /dev/null 2>&1', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], ) http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index 653e764..a56c26b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -144,7 +144,7 @@ class TestHiveMetastore(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', @@ -211,7 +211,7 @@ class TestHiveMetastore(RMFTestCase): ) def assert_configure_secured(self): - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 8eb6bd2..0350589 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -257,7 +257,7 @@ class TestHiveServer(RMFTestCase): kinit_path_local = "/usr/bin/kinit", action = ['create'], ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', @@ -353,7 +353,7 @@ class TestHiveServer(RMFTestCase): action = ['create'], ) - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py index 3abfa57..d1c4e45 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py @@ -30,10 +30,10 @@ class TestHookBeforeInstall(RMFTestCase): command="hook", config_file="default.json" ) - self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/; curl -kf -x "" --retry 10 http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /tmp/HDP-artifacts//UnlimitedJCEPolicyJDK7.zip', + self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/; curl -kf -x "" --retry 10 http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', environment = {'no_proxy': 'c6401.ambari.apache.org'}, - not_if = 'test -e /tmp/HDP-artifacts//UnlimitedJCEPolicyJDK7.zip', + not_if = 'test -e /tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', ignore_failures = True, path = ['/bin', '/usr/bin/'], ) - self.assertNoMoreResources() \ No newline at end of file + self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py index 9dfcff2..a26798e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py @@ -40,12 +40,12 @@ class TestHookBeforeInstall(RMFTestCase): ) self.assertResourceCalled('Package', 'unzip',) self.assertResourceCalled('Package', 'curl',) - self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz', + self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], environment = {'no_proxy': 'c6401.ambari.apache.org'}, ) - self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz > /dev/null 2>&1', + self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz > /dev/null 2>&1', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], ) http://git-wip-us.apache.org/repos/asf/ambari/blob/90940781/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index fd4ee43..aba747c 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -104,7 +104,7 @@ class TestHiveMetastore(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self): - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar', @@ -174,7 +174,7 @@ class TestHiveMetastore(RMFTestCase): ) def assert_configure_secured(self): - self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/HDP-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', + self.assertResourceCalled('Execute', 'hive mkdir -p /tmp/AMBARI-artifacts/ ; cp /usr/share/java/mysql-connector-java.jar /usr/lib/hive/lib//mysql-connector-java.jar', creates = '/usr/lib/hive/lib//mysql-connector-java.jar', path = ['/bin', '/usr/bin/'], not_if = 'test -f /usr/lib/hive/lib//mysql-connector-java.jar',