http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/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 3859236..357ee56 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 @@ -35,6 +35,7 @@ class TestHiveServer(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "HIVE/0.12.0.2.0/package" STACK_VERSION = "2.0.6" UPGRADE_STACK_VERSION = "2.2" + @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=False)) def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", @@ -51,7 +52,6 @@ class TestHiveServer(RMFTestCase): @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=False)) def test_start_default(self, socket_mock): s = socket_mock.return_value - self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname="HiveServer", command="start", @@ -84,7 +84,6 @@ class TestHiveServer(RMFTestCase): @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=False)) def test_start_default_no_copy(self): - self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", command = "start", @@ -271,6 +270,7 @@ class TestHiveServer(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self, no_tmp = False): + # Verify creating of Hcat and Hive directories self.assertResourceCalled('HdfsResource', '/apps/webhcat', security_enabled = False, hadoop_bin_dir = '/usr/bin', @@ -295,19 +295,7 @@ class TestHiveServer(RMFTestCase): action = ['create_on_execute'], mode = 0755, ) - self.assertResourceCalled('HdfsResource', '/apps/webhcat/hive.tar.gz', - security_enabled = False, - hadoop_conf_dir = '/etc/hadoop/conf', - keytab = UnknownConfigurationMock(), - source = '/usr/share/HDP-webhcat/hive.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - action = ['create_on_execute'], - group = 'hadoop', - hadoop_bin_dir = '/usr/bin', - type = 'file', - mode = 0755, - ) + self.assertResourceCalled('HdfsResource', '/apps/hive/warehouse', security_enabled = False, hadoop_bin_dir = '/usr/bin', @@ -363,6 +351,7 @@ class TestHiveServer(RMFTestCase): group='hadoop', recursive=True, ) + self.assertResourceCalled('XmlConfig', 'mapred-site.xml', group='hadoop', conf_dir='/etc/hive/conf', @@ -458,7 +447,6 @@ class TestHiveServer(RMFTestCase): cd_access='a', ) - def assert_configure_secured(self): self.assertResourceCalled('HdfsResource', '/apps/webhcat', security_enabled = True, @@ -484,19 +472,7 @@ class TestHiveServer(RMFTestCase): action = ['create_on_execute'], mode = 0755, ) - self.assertResourceCalled('HdfsResource', '/apps/webhcat/hive.tar.gz', - security_enabled = True, - hadoop_conf_dir = '/etc/hadoop/conf', - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - source = '/usr/share/HDP-webhcat/hive.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - action = ['create_on_execute'], - group = 'hadoop', - hadoop_bin_dir = '/usr/bin', - type = 'file', - mode = 0755, - ) + self.assertResourceCalled('HdfsResource', '/apps/hive/warehouse', security_enabled = True, hadoop_bin_dir = '/usr/bin', @@ -815,7 +791,10 @@ class TestHiveServer(RMFTestCase): put_structured_out_mock.assert_called_with({"securityState": "UNSECURED"}) @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=True)) - def test_pre_rolling_restart(self): + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") + def test_pre_rolling_restart(self, copy_to_hdfs_mock): + copy_to_hdfs_mock.return_value = True + config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) @@ -829,19 +808,10 @@ class TestHiveServer(RMFTestCase): target = RMFTestCase.TARGET_COMMON_SERVICES) self.assertResourceCalled('Execute', 'hdp-select set hive-server2 %s' % version,) - self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.0.0.0-1234/mapreduce//mapreduce.tar.gz', - security_enabled = False, - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - keytab = UnknownConfigurationMock(), - source = '/usr/hdp/current/hadoop-client/mapreduce.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - action = ['create_on_execute'], - group = 'hadoop', - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - type = 'file', - mode = 0444, - ) + + copy_to_hdfs_mock.assert_any_call("mapreduce", "hadoop", "hdfs") + copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs") + self.assertEquals(2, copy_to_hdfs_mock.call_count) self.assertResourceCalled('HdfsResource', None, security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', @@ -855,13 +825,15 @@ class TestHiveServer(RMFTestCase): @patch("resource_management.core.shell.call") @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value=True)) - def test_pre_rolling_restart_23(self, call_mock): + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") + def test_pre_rolling_restart_23(self, copy_to_hdfs_mock, call_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) version = '2.3.0.0-1234' json_content['commandParams']['version'] = version + copy_to_hdfs_mock.return_value = True mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hive_server.py", classname = "HiveServer", @@ -873,20 +845,11 @@ class TestHiveServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', + 'hdp-select set hive-server2 %s' % version,) - self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.0.0.0-1234/mapreduce//mapreduce.tar.gz', - security_enabled = False, - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - keytab = UnknownConfigurationMock(), - source = '/usr/hdp/current/hadoop-client/mapreduce.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - action = ['create_on_execute'], - group = 'hadoop', - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - type = 'file', - mode = 0444, - ) + copy_to_hdfs_mock.assert_any_call("mapreduce", "hadoop", "hdfs") + copy_to_hdfs_mock.assert_any_call("tez", "hadoop", "hdfs") + self.assertEquals(2, copy_to_hdfs_mock.call_count) self.assertResourceCalled('HdfsResource', None, security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py index 79e3697..4e56be3 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/PIG/test_pig_service_check.py @@ -73,6 +73,7 @@ class TestPigServiceCheck(RMFTestCase): tries = 3, user = 'ambari-qa', try_sleep = 5, + logoutput = True ) self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', @@ -132,6 +133,7 @@ class TestPigServiceCheck(RMFTestCase): tries = 3, user = 'ambari-qa', try_sleep = 5, + logoutput = True ) self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 494e138..2b1b581 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -674,13 +674,15 @@ class TestHistoryServer(RMFTestCase): @patch.object(Script, "is_hdp_stack_greater_or_equal", new = MagicMock(return_value="2.3.0")) @patch.object(functions, "get_hdp_version", new = MagicMock(return_value="2.3.0.0-1234")) - def test_pre_rolling_restart_23(self): + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") + def test_pre_rolling_restart_23(self, copy_to_hdfs_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.0.6/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) version = '2.3.0.0-1234' json_content['commandParams']['version'] = version + copy_to_hdfs_mock.return_value = True mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/historyserver.py", classname = "HistoryServer", @@ -692,20 +694,7 @@ class TestHistoryServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', 'hdp-select set hadoop-mapreduce-historyserver %s' % version) - self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.3.0.0-1234/mapreduce//mapreduce.tar.gz', - security_enabled = False, - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - keytab = UnknownConfigurationMock(), - source = '/usr/hdp/current/hadoop-client/mapreduce.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - owner = 'hdfs', - group = 'hadoop', - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - type = 'file', - action = ['create_on_execute'], - mode = 0444, - ) + copy_to_hdfs_mock.assert_called_with("mapreduce", "hadoop", "hdfs") self.assertResourceCalled('HdfsResource', None, security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', @@ -715,6 +704,7 @@ class TestHistoryServer(RMFTestCase): action = ['execute'], hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', ) + self.assertNoMoreResources() self.assertEquals(2, mocks_dict['call'].call_count) http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py index 9025b48..b97d50d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py @@ -185,7 +185,7 @@ class TestResourceManager(RMFTestCase): content = Template('exclude_hosts_list.j2'), group = 'hadoop', ) - self.assertResourceCalled('Execute', ' yarn --config /etc/hadoop/conf rmadmin -refreshNodes', + self.assertResourceCalled('Execute', '{rm_kinit_cmd} yarn --config {conf_dir} rmadmin -refreshNodes', environment = {'PATH': "/bin:/usr/bin:/usr/lib/hadoop-yarn/bin"}, user = 'yarn', ) @@ -204,7 +204,7 @@ class TestResourceManager(RMFTestCase): content = Template('exclude_hosts_list.j2'), group = 'hadoop', ) - self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/rm.service.keytab rm/[email protected]; yarn --config /etc/hadoop/conf rmadmin -refreshNodes', + self.assertResourceCalled('Execute', '{rm_kinit_cmd} yarn --config {conf_dir} rmadmin -refreshNodes', environment = {'PATH': "/bin:/usr/bin:/usr/lib/hadoop-yarn/bin"}, user = 'yarn', ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json index aeecb79..4c7b090 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json @@ -569,22 +569,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "ignore_groupsusers_create": "false", + "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" }, "ranger-hbase-plugin-properties": { "POLICY_MGR_URL": "{{policymgr_mgr_url}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index d0c164e..510ccda 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -528,26 +528,14 @@ "xml_configurations_supported" : "false" }, "cluster-env": { - "security_enabled": "false", - "hdfs_user_principal" : "", - "hdfs_user_keytab" : "", - "ignore_groupsusers_create": "false", - "smokeuser": "ambari-qa", - "kerberos_domain": "EXAMPLE.COM", - "user_group": "hadoop", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" + "security_enabled": "false", + "hdfs_user_principal" : "", + "hdfs_user_keytab" : "", + "ignore_groupsusers_create": "false", + "smokeuser": "ambari-qa", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop" }, - "hbase-env": { "hbase_pid_dir": "/var/run/hbase", "hbase_user": "hbase", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json index 9502b14..b644411 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json @@ -281,9 +281,7 @@ "ignore_groupsusers_create": "false", "smokeuser": "ambari-qa", "kerberos_domain": "EXAMPLE.COM", - "user_group": "hadoop", - "mapreduce_tar_destination_folder" : "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "mapreduce_tar_source" : "/usr/hdp/current/hadoop-client/mapreduce.tar.gz" + "user_group": "hadoop" }, "hbase-env": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json index 4465ca7..770e085 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json @@ -283,9 +283,7 @@ "ignore_groupsusers_create": "false", "smokeuser": "ambari-qa", "kerberos_domain": "EXAMPLE.COM", - "user_group": "hadoop", - "mapreduce_tar_destination_folder" : "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "mapreduce_tar_source" : "/usr/hdp/current/hadoop-client/mapreduce.tar.gz" + "user_group": "hadoop" }, "hbase-env": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json index ac95268..4cf647b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json @@ -506,9 +506,7 @@ "ignore_groupsusers_create": "false", "smokeuser": "ambari-qa", "kerberos_domain": "EXAMPLE.COM", - "user_group": "hadoop", - "mapreduce_tar_destination_folder" : "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "mapreduce_tar_source" : "/usr/hdp/current/hadoop-client/mapreduce.tar.gz" + "user_group": "hadoop" }, "hbase-env": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json index fa48c6d..e7a516f 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json @@ -565,24 +565,10 @@ }, "cluster-env": { "security_enabled": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "oozie_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/oozie/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "ignore_groupsusers_create": "false", + "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "oozie_tar_source": "/usr/hdp/current/oozie-client/oozie-sharelib.tar.gz", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" }, "ranger-hbase-plugin-properties": { "POLICY_MGR_URL": "{{policymgr_mgr_url}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json index 88017b5..83120eb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json @@ -594,24 +594,10 @@ }, "cluster-env": { "security_enabled": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "oozie_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/oozie/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "ignore_groupsusers_create": "false", + "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "oozie_tar_source": "/usr/hdp/current/oozie-client/oozie-sharelib.tar.gz", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json index fc798c2..0b09520 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json @@ -105,23 +105,11 @@ "fs.defaultFS": "hdfs://c6403.org:8020" }, "cluster-env": { - "security_enabled": "false", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "smokeuser": "ambari-qa", - "ignore_groupsusers_create": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" + "security_enabled": "false", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser": "ambari-qa" }, "ranger-hbase-plugin-properties": { "POLICY_MGR_URL": "{{policymgr_mgr_url}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json index 3109b7a..349a1cf 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json @@ -565,24 +565,10 @@ }, "cluster-env": { "security_enabled": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "oozie_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/oozie/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "ignore_groupsusers_create": "false", + "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "oozie_tar_source": "/usr/hdp/current/oozie-client/oozie-sharelib.tar.gz", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" }, "ranger-hbase-plugin-properties": { "POLICY_MGR_URL": "{{policymgr_mgr_url}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json index 5999fb7..a026259 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json @@ -159,24 +159,12 @@ "namenode_opt_permsize": "128m" }, "cluster-env": { - "security_enabled": "false", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "ignore_groupsusers_create": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "false", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser": "ambari-qa", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" }, "ranger-hdfs-plugin-properties": { "XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS": "900", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json index a9113c4..84c798b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json @@ -251,23 +251,11 @@ }, "cluster-env": { "security_enabled": "false", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", "ignore_groupsusers_create": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", "user_group": "hadoop", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json index 097097d..1d40121 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json @@ -550,18 +550,7 @@ "kerberos_domain": "EXAMPLE.COM", "user_group": "hadoop", "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "kinit_path_local": "/usr/bin", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" + "kinit_path_local": "/usr/bin" }, "hadoop-env": { "namenode_opt_maxnewsize": "200m", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json index 4a2dc97..f3defee 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json @@ -53,22 +53,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "ignore_groupsusers_create": "false", + "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" } }, "commandId": "25-1", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json index 1534619..ca0b1a6 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json @@ -540,22 +540,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py index 039b14d..dcdae89 100644 --- a/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/PIG/test_pig_service_check.py @@ -26,7 +26,10 @@ class TestPigServiceCheck(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "PIG/0.12.0.2.0/package" STACK_VERSION = "2.2" - def test_service_check_secure(self): + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") + def test_service_check_secure(self, copy_to_hdfs_mock): + copy_to_hdfs_mock.return_value = True + self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/service_check.py", classname="PigServiceCheck", command="service_check", @@ -69,16 +72,13 @@ class TestPigServiceCheck(RMFTestCase): content=StaticFile("pigSmoke.sh"), mode=0755 ) - - - self.assertResourceCalled("Execute", "pig /tmp/pigSmoke.sh", path=["/usr/hdp/current/pig-client/bin:/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin"], tries=3, user="ambari-qa", - try_sleep=5 + try_sleep=5, + logoutput=True ) - self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', bin_dir = '/usr/hdp/current/hadoop-client/bin', user = 'ambari-qa', @@ -105,19 +105,8 @@ class TestPigServiceCheck(RMFTestCase): hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', type = 'file', ) - self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz', - security_enabled = True, - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - keytab = '/etc/security/keytabs/hdfs.headless.keytab', - source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - owner = 'hdfs', - group = 'hadoop', - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - type = 'file', - action = ['create_on_execute'], - ) + + copy_to_hdfs_mock.assert_called_with("tez", "hadoop", "hdfs") self.assertResourceCalled('HdfsResource', None, security_enabled = True, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', @@ -135,7 +124,8 @@ class TestPigServiceCheck(RMFTestCase): tries=3, try_sleep=5, path=["/usr/hdp/current/pig-client/bin:/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin"], - user="ambari-qa" + user="ambari-qa", + logoutput=True ) self.assertResourceCalled('ExecuteHadoop', 'fs -test -e /user/ambari-qa/pigsmoke.out', http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py index 4e8ec42..489037c 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py @@ -80,7 +80,7 @@ class TestJobHistoryServer(RMFTestCase): ) self.assert_configure_secured() self.assertNoMoreResources() - + def test_start_secured(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/job_history_server.py", classname = "JobHistoryServer", @@ -93,28 +93,7 @@ class TestJobHistoryServer(RMFTestCase): self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/spark.service.keytab spark/[email protected]; ', user = 'spark', ) - self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz', - security_enabled = True, - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - keytab = UnknownConfigurationMock(), - source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = UnknownConfigurationMock(), - owner = UnknownConfigurationMock(), - group = 'hadoop', - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - type = 'file', - action = ['create_on_execute'], - ) - self.assertResourceCalled('HdfsResource', None, - security_enabled = True, - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - keytab = UnknownConfigurationMock(), - kinit_path_local = '/usr/bin/kinit', - user = UnknownConfigurationMock(), - action = ['execute'], - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - ) + self.assertResourceCalled('Execute', '/usr/hdp/current/spark-client/sbin/start-history-server.sh', environment = {'JAVA_HOME': u'/usr/jdk64/jdk1.7.0_45'}, not_if = 'ls /var/run/spark/spark-spark-org.apache.spark.deploy.history.HistoryServer-1.pid >/dev/null 2>&1 && ps -p `cat /var/run/spark/spark-spark-org.apache.spark.deploy.history.HistoryServer-1.pid` >/dev/null 2>&1', @@ -253,13 +232,15 @@ class TestJobHistoryServer(RMFTestCase): group = 'spark', ) - def test_pre_rolling_restart_23(self): + @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs") + def test_pre_rolling_restart_23(self, copy_to_hdfs_mock): config_file = self.get_src_folder()+"/test/python/stacks/2.2/configs/default.json" with open(config_file, "r") as f: json_content = json.load(f) version = '2.3.0.0-1234' json_content['commandParams']['version'] = version + copy_to_hdfs_mock.return_value = True mocks_dict = {} self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/job_history_server.py", classname = "JobHistoryServer", @@ -271,19 +252,8 @@ class TestJobHistoryServer(RMFTestCase): mocks_dict = mocks_dict) self.assertResourceCalled('Execute', 'hdp-select set spark-historyserver {0}'.format(version)) - self.assertResourceCalled('HdfsResource', 'hdfs:///hdp/apps/2.2.0.0/tez//tez.tar.gz', - security_enabled = False, - hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf', - keytab = UnknownConfigurationMock(), - source = '/usr/hdp/current/tez-client/lib/tez.tar.gz', - kinit_path_local = '/usr/bin/kinit', - user = 'hdfs', - owner = 'hdfs', - group = 'hadoop', - hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', - type = 'file', - action = ['create_on_execute'], - ) + + copy_to_hdfs_mock.assert_called_with("tez", "hadoop", "hdfs") self.assertResourceCalled('HdfsResource', None, security_enabled = False, hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin', http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py index a02a908..415527f 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py @@ -36,6 +36,7 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('Execute', "curl -s -o /dev/null -w'%{http_code}' --negotiate -u: -k http://localhost:18080 | grep 200", tries = 10, try_sleep = 3, + logoutput = True ) self.assertNoMoreResources() @@ -54,5 +55,6 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('Execute', "curl -s -o /dev/null -w'%{http_code}' --negotiate -u: -k http://localhost:18080 | grep 200", tries = 10, try_sleep = 3, + logoutput = True ) self.assertNoMoreResources() \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json index 8c85311..505086d 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json @@ -186,18 +186,7 @@ "ignore_groupsusers_create": "false", "smokeuser": "ambari-qa", "kerberos_domain": "EXAMPLE.COM", - "user_group": "hadoop", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" + "user_group": "hadoop" }, "ranger-knox-plugin-properties": { "POLICY_MGR_URL": "{{policymgr_mgr_url}}", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json index dce5cae..a4f9dc9 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json @@ -222,22 +222,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "ignore_groupsusers_create": "false", + "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "user_group": "hadoop", + "smokeuser": "ambari-qa" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json index c4d7f6b..95456f9 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json @@ -374,22 +374,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "smokeuser": "ambari-qa" }, "ranger-hive-plugin-properties": { "XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS": "900", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json index 3b6a2fa..d56d08e 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json @@ -1027,25 +1027,13 @@ "content": "\n#\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied. See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n#\n#\n\n# ***** Set root logger level to DEBUG and its only appender to A.\nlog4j.logger.org.apache.pig=info, A\n\n# ***** A is set to be a ConsoleAppender.\ nlog4j.appender.A=org.apache.log4j.ConsoleAppender\n# ***** A uses PatternLayout.\nlog4j.appender.A.layout=org.apache.log4j.PatternLayout\nlog4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n" }, "cluster-env": { - "security_enabled": "true", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "smokeuser_principal_name": "[email protected]", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "ignore_groupsusers_create": "false", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "true", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser_principal_name": "[email protected]", + "smokeuser": "ambari-qa", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json index 9d8cb39..0419223 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json @@ -1027,25 +1027,11 @@ "content": "\n#\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied. See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n#\n#\n\n# ***** Set root logger level to DEBUG and its only appender to A.\nlog4j.logger.org.apache.pig=info, A\n\n# ***** A is set to be a ConsoleAppender.\ nlog4j.appender.A=org.apache.log4j.ConsoleAppender\n# ***** A uses PatternLayout.\nlog4j.appender.A.layout=org.apache.log4j.PatternLayout\nlog4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n" }, "cluster-env": { - "security_enabled": "true", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "smokeuser_principal_name": "[email protected]", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "ignore_groupsusers_create": "false", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "true", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser": "ambari-qa" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json index 06cd36e..5e71ad7 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json @@ -173,22 +173,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "smokeuser": "ambari-qa" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json index 19db471..036b821 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json @@ -172,22 +172,10 @@ }, "cluster-env": { "security_enabled": "false", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", "ignore_groupsusers_create": "false", "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", "user_group": "hadoop", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/" + "smokeuser": "ambari-qa" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json index a7a6121..ca7e521 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json @@ -522,25 +522,13 @@ "content": "\n#\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied. See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n#\n#\n\n# ***** Set root logger level to DEBUG and its only appender to A.\nlog4j.logger.org.apache.pig=info, A\n\n# ***** A is set to be a ConsoleAppender.\ nlog4j.appender.A=org.apache.log4j.ConsoleAppender\n# ***** A uses PatternLayout.\nlog4j.appender.A.layout=org.apache.log4j.PatternLayout\nlog4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n" }, "cluster-env": { - "security_enabled": "true", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "smokeuser_principal_name": "[email protected]", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "ignore_groupsusers_create": "false", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "true", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser_principal_name": "[email protected]", + "smokeuser": "ambari-qa", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json index 3e6307d..5776a1e 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json @@ -803,25 +803,13 @@ "zookeeper_principal_name": "zookeeper/[email protected]" }, "cluster-env": { - "security_enabled": "true", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "smokeuser_principal_name": "[email protected]", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "ignore_groupsusers_create": "false", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "true", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser": "ambari-qa", + "smokeuser_principal_name": "[email protected]", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json index caec8ca..633ce75 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json @@ -802,25 +802,13 @@ "zookeeper_principal_name": "zookeeper/[email protected]" }, "cluster-env": { - "security_enabled": "true", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "smokeuser_principal_name": "[email protected]", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "ignore_groupsusers_create": "false", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "true", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser_principal_name": "[email protected]", + "smokeuser": "ambari-qa", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/secured.json b/ambari-server/src/test/python/stacks/2.2/configs/secured.json index dc674fe..2e8fa2f 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/secured.json @@ -174,18 +174,7 @@ "user_group": "hadoop", "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", "smokeuser_principal_name": "[email protected]", - "kinit_path_local": "/usr/bin", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" + "kinit_path_local": "/usr/bin" }, "webhcat-site": { "templeton.jar": "/usr/hdp/current/hive-webhcat/share/webhcat/svr/lib/hive-webhcat-*.jar", http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json b/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json index 131cf19..185d4d5 100644 --- a/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json +++ b/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json @@ -98,24 +98,12 @@ "content": "\n# syntax: [instance].sink|source.[name].[options]=[value]\n\n# This file configures Spark's internal metrics system. The metrics system is\n# divided into instances which correspond to internal components.\n# Each instance can be configured to report its metrics to one or more sinks.\n# Accepted values for [instance] are \"master\", \"worker\", \"executor\", \"driver\",\n# and \"applications\". A wild card \"*\" can be used as an instance name, in\n# which case all instances will inherit the supplied property.\n#\n# Within an instance, a \"source\" specifies a particular set of grouped metrics.\n# there are two kinds of sources:\n# 1. Spark internal sources, like MasterSource, WorkerSource, etc, which will\n# collect a Spark component's internal state. Each instance is paired with a\n# Spark source that is added automatically.\n# 2. Common sources, like JvmSource, which will collect low level state.\n# These can be added through configuration options and ar e then loaded\n# using reflection.\n#\n# A \"sink\" specifies where metrics are delivered to. Each instance can be\n# assigned one or more sinks.\n#\n# The sink|source field specifies whether the property relates to a sink or\n# source.\n#\n# The [name] field specifies the name of source or sink.\n#\n# The [options] field is the specific property of this source or sink. The\n# source or sink is responsible for parsing this property.\n#\n# Notes:\n# 1. To add a new sink, set the \"class\" option to a fully qualified class\n# name (see examples below).\n# 2. Some sinks involve a polling period. The minimum allowed polling period\n# is 1 second.\n# 3. Wild card properties can be overridden by more specific properties.\n# For example, master.sink.console.period takes precedence over\n# *.sink.console.period.\n# 4. A metrics specific configuration\n# \"spark.metrics.conf=${SPARK_HOME}/conf/metrics.properties\" should be\n# added to Java properties using -Dspark.metrics.conf=xxx if you wa nt to\n# customize metrics system. You can also put the file in ${SPARK_HOME}/conf\n# and it will be loaded automatically.\n# 5. MetricsServlet is added by default as a sink in master, worker and client\n# driver, you can send http request \"/metrics/json\" to get a snapshot of all the\n# registered metrics in json format. For master, requests \"/metrics/master/json\" and\n# \"/metrics/applications/json\" can be sent seperately to get metrics snapshot of\n# instance master and applications. MetricsServlet may not be configured by self.\n#\n\n## List of available sinks and their properties.\n\n# org.apache.spark.metrics.sink.ConsoleSink\n# Name: Default: Description:\n# period 10 Poll period\n# unit seconds Units of poll period\n\n# org.apache.spark.metrics.sink.CSVSink\n# Name: Default: Description:\n# period 10 Poll period\n# unit seconds Units of poll period\n# directory /tmp Where to store CSV files\n\n# org.apache.spark.metrics.sink.GangliaSink\n# Name: Default: Description:\n# host NONE Hostname or multicast group of Ganglia server\n# port NONE Port of Ganglia server(s)\n# period 10 Poll period\n# unit seconds Units of poll period\n# ttl 1 TTL of messages sent by Ganglia\n# mode multicast Ganglia network mode ('unicast' or 'multicast')\n\n# org.apache.spark.metrics.sink.JmxSink\n\n# org.apache.spark.metrics.sink.MetricsServlet\n# Name: Default: Description:\n# path VARIES* Path prefix from the web server root\n# sample false Whether to show entire set of samples for histograms ('false' or 'true')\n#\n# * Default path is /metrics/json for all instances except the master. The master has two paths:\n# /metrics/aplications/json # App information\n# /metrics/master/json # Master information\n\n# org.apache.spark.metrics.sink.GraphiteSink\n# Name: Default: Description:\n# host NONE Hostname of Graphite server\n# port NONE Port of Graphite server\n# period 10 Poll period\n# unit seconds Units of poll period\n# prefix EMPTY STRING Prefix to prepend to metric name \n\n## Examples\n# Enable JmxSink for all instances by class name\n#*.sink.jmx.class=org.apache.spark.metrics.sink.JmxSink\n\n# Enable ConsoleSink for all instances by class name\n#*.sink.console.class=org.apache.spark.metrics.sink.ConsoleSink\n\n# Polling period for ConsoleSink\n#*.sink.console.period=10\n\n#*.sink.console.unit=seconds\n\n# Master instance overlap polling period\n#master.sink.console.period=15\n\n#master.sink.console.unit=seconds\n\n# Enable CsvSink for all instances\n#*.sink.csv.class=org.apache.spark.metrics.sink.CsvSink\n\n# Polling period for CsvSink\n#*.sink.csv.period=1\n\n#*.sink.csv.unit=minutes\n\n# Polling directory for CsvSink\n#*.sink.csv.directory=/tmp/\n\n# Worker instance overlap polling period\n#worker.sink.csv.period=10\n\n#worker.sink.csv.unit=minutes\n\n# Enable jvm source for instance master, worker, driver and executor\n#master.source.jvm.class=org.apache.spark.metrics.source.JvmSource\n\n#worker.source.jvm.class=org.apache.spark.metrics.source .JvmSource\n\n#driver.source.jvm.class=org.apache.spark.metrics.source.JvmSource\n\n#executor.source.jvm.class=org.apache.spark.metrics.source.JvmSource" }, "cluster-env": { - "security_enabled": "false", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "ignore_groupsusers_create": "false", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz", - "smokeuser": "ambari-qa", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz" + "security_enabled": "false", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser": "ambari-qa", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f1787236/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json index b1209d0..f5a4487 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json @@ -311,24 +311,12 @@ "content": "\n#\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements. See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership. The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License. You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied. See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n#\n#\n\n#\n# ZooKeeper Logging Configuration\n#\n\n# DEFAULT: console appender only\nlog4j.rootLogger=INFO, CONSOLE\n\n# Example with rolling log file\n#log4 j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE\n\n# Example with rolling log file and tracing\n#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE\n\n#\n# Log INFO level and above messages to the console\n#\nlog4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender\nlog4j.appender.CONSOLE.Threshold=INFO\nlog4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout\nlog4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n\n\n#\n# Add ROLLINGFILE to rootLogger to get log file output\n# Log DEBUG level and above messages to a log file\nlog4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender\nlog4j.appender.ROLLINGFILE.Threshold=DEBUG\nlog4j.appender.ROLLINGFILE.File=zookeeper.log\n\n# Max log file size of 10MB\nlog4j.appender.ROLLINGFILE.MaxFileSize=10MB\n# uncomment the next line to limit number of backup files\n#log4j.appender.ROLLINGFILE.MaxBackupIndex=10\n\nlog4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout\nlog4j.appender.ROLLIN GFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n\n\n\n#\n# Add TRACEFILE to rootLogger to get log file output\n# Log DEBUG level and above messages to a log file\nlog4j.appender.TRACEFILE=org.apache.log4j.FileAppender\nlog4j.appender.TRACEFILE.Threshold=TRACE\nlog4j.appender.TRACEFILE.File=zookeeper_trace.log\n\nlog4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout\n### Notice we are including log4j's NDC here (%x)\nlog4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n" }, "cluster-env": { - "security_enabled": "false", - "hive_tar_source": "/usr/hdp/current/hive-client/hive.tar.gz", - "hadoop-streaming_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "pig_tar_source": "/usr/hdp/current/pig-client/pig.tar.gz", - "hive_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/hive/", - "ignore_groupsusers_create": "false", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "hadoop-streaming_tar_source": "/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar", - "kerberos_domain": "EXAMPLE.COM", - "tez_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/tez/", - "mapreduce_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/", - "tez_tar_source": "/usr/hdp/current/tez-client/lib/tez.tar.gz", - "pig_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/pig/", - "user_group": "hadoop", - "mapreduce_tar_source": "/usr/hdp/current/hadoop-client/mapreduce.tar.gz", - "sqoop_tar_destination_folder": "hdfs:///hdp/apps/{{ hdp_stack_version }}/sqoop/", - "smokeuser": "ambari-qa", - "sqoop_tar_source": "/usr/hdp/current/sqoop-client/sqoop.tar.gz" + "security_enabled": "false", + "ignore_groupsusers_create": "false", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop", + "smokeuser": "ambari-qa", + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" } }, "configurationTags": {
