You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/02 20:39:47 UTC

[36/50] [abbrv] ambari git commit: AMBARI-22083 - Wrong Hadoop Home Directory Is Being Picked Up on MAINT/PATCH Upgraded Clusters (jonathanhurley)

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
index f0a89a9..fbe5403 100644
--- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
@@ -96,7 +96,7 @@ class TestSparkThriftServer(RMFTestCase):
     self.assertResourceCalled('HdfsResource', '/user/spark',
         immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.3.2.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
         hdfs_site = {u'a': u'b'},
@@ -104,7 +104,7 @@ class TestSparkThriftServer(RMFTestCase):
         principal_name = UnknownConfigurationMock(),
         user = 'hdfs',
         owner = 'spark',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.3.2.0-2067/hadoop/conf',
         type = 'directory',
         action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
         dfs_type = '',
@@ -113,7 +113,7 @@ class TestSparkThriftServer(RMFTestCase):
     self.assertResourceCalled('HdfsResource', None,
         immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.3.2.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
         hdfs_site = {u'a': u'b'},
@@ -122,7 +122,7 @@ class TestSparkThriftServer(RMFTestCase):
         user = 'hdfs',
         action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
         dfs_type = '',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.3.2.0-2067/hadoop/conf',
     )
     self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf',
         owner = 'spark',

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
index 7ebe2f5..34ca102 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
@@ -171,8 +171,8 @@ class TestRangerKMS(RMFTestCase):
                         security_enabled = False,
                         keytab = None,
                         kinit_path_local = '/usr/bin/kinit',
-                        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
-                        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                        hadoop_bin_dir = '/usr/hdp/2.5.0.0-777/hadoop/bin',
+                        hadoop_conf_dir = '/usr/hdp/2.5.0.0-777/hadoop/conf',
                         principal_name = None,
                         hdfs_site = self.getConfig()['configurations']['hdfs-site'],
                         default_fs = 'hdfs://c6401.ambari.apache.org:8020'
@@ -189,8 +189,8 @@ class TestRangerKMS(RMFTestCase):
                         security_enabled = False,
                         keytab = None,
                         kinit_path_local = '/usr/bin/kinit',
-                        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
-                        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                        hadoop_bin_dir = '/usr/hdp/2.5.0.0-777/hadoop/bin',
+                        hadoop_conf_dir = '/usr/hdp/2.5.0.0-777/hadoop/conf',
                         principal_name = None,
                         hdfs_site = self.getConfig()['configurations']['hdfs-site'],
                         default_fs = 'hdfs://c6401.ambari.apache.org:8020'
@@ -202,8 +202,8 @@ class TestRangerKMS(RMFTestCase):
                         security_enabled = False,
                         keytab = None,
                         kinit_path_local = '/usr/bin/kinit',
-                        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
-                        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                        hadoop_bin_dir = '/usr/hdp/2.5.0.0-777/hadoop/bin',
+                        hadoop_conf_dir = '/usr/hdp/2.5.0.0-777/hadoop/conf',
                         principal_name = None,
                         hdfs_site = self.getConfig()['configurations']['hdfs-site'],
                         default_fs = 'hdfs://c6401.ambari.apache.org:8020'
@@ -611,8 +611,8 @@ class TestRangerKMS(RMFTestCase):
                         security_enabled = True,
                         keytab = '/etc/security/keytabs/hdfs.headless.keytab',
                         kinit_path_local = '/usr/bin/kinit',
-                        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
-                        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                        hadoop_bin_dir = '/usr/hdp/2.5.0.0-777/hadoop/bin',
+                        hadoop_conf_dir = '/usr/hdp/2.5.0.0-777/hadoop/conf',
                         principal_name = 'hdfs-cl1@EXAMPLE.COM',
                         hdfs_site = self.getConfig()['configurations']['hdfs-site'],
                         default_fs = 'hdfs://c6401.ambari.apache.org:8020'
@@ -629,8 +629,8 @@ class TestRangerKMS(RMFTestCase):
                         security_enabled = True,
                         keytab = '/etc/security/keytabs/hdfs.headless.keytab',
                         kinit_path_local = '/usr/bin/kinit',
-                        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
-                        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                        hadoop_bin_dir = '/usr/hdp/2.5.0.0-777/hadoop/bin',
+                        hadoop_conf_dir = '/usr/hdp/2.5.0.0-777/hadoop/conf',
                         principal_name = 'hdfs-cl1@EXAMPLE.COM',
                         hdfs_site = self.getConfig()['configurations']['hdfs-site'],
                         default_fs = 'hdfs://c6401.ambari.apache.org:8020'
@@ -642,8 +642,8 @@ class TestRangerKMS(RMFTestCase):
                         security_enabled = True,
                         keytab = '/etc/security/keytabs/hdfs.headless.keytab',
                         kinit_path_local = '/usr/bin/kinit',
-                        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
-                        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                        hadoop_bin_dir = '/usr/hdp/2.5.0.0-777/hadoop/bin',
+                        hadoop_conf_dir = '/usr/hdp/2.5.0.0-777/hadoop/conf',
                         principal_name = 'hdfs-cl1@EXAMPLE.COM',
                         hdfs_site = self.getConfig()['configurations']['hdfs-site'],
                         default_fs = 'hdfs://c6401.ambari.apache.org:8020'

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.5/SPARK/test_spark_livy.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/SPARK/test_spark_livy.py b/ambari-server/src/test/python/stacks/2.5/SPARK/test_spark_livy.py
index 3c7e4a2..4f1fb17 100644
--- a/ambari-server/src/test/python/stacks/2.5/SPARK/test_spark_livy.py
+++ b/ambari-server/src/test/python/stacks/2.5/SPARK/test_spark_livy.py
@@ -56,7 +56,7 @@ class TestSparkClient(RMFTestCase):
         self.assertResourceCalled('HdfsResource', '/user/livy',
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -64,7 +64,7 @@ class TestSparkClient(RMFTestCase):
                                   principal_name = UnknownConfigurationMock(),
                                   user = 'hdfs',
                                   owner = 'livy',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   type = 'directory',
                                   action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
@@ -73,7 +73,7 @@ class TestSparkClient(RMFTestCase):
         self.assertResourceCalled('HdfsResource', None,
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -82,12 +82,12 @@ class TestSparkClient(RMFTestCase):
                                   user = 'hdfs',
                                   action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   )
         self.assertResourceCalled('HdfsResource', '/livy-recovery',
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -95,7 +95,7 @@ class TestSparkClient(RMFTestCase):
                                   principal_name = UnknownConfigurationMock(),
                                   user = 'hdfs',
                                   owner = 'livy',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   type = 'directory',
                                   action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
@@ -104,7 +104,7 @@ class TestSparkClient(RMFTestCase):
         self.assertResourceCalled('HdfsResource', None,
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -113,7 +113,7 @@ class TestSparkClient(RMFTestCase):
                                   user = 'hdfs',
                                   action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   )
         self.assertResourceCalled('File', '/usr/hdp/current/livy-server/conf/livy-env.sh',
                                   content = InlineTemplate(self.getConfig()['configurations']['livy-env']['content']),

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_060.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_060.py b/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_060.py
index 8df053c..7d4217e 100644
--- a/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_060.py
+++ b/ambari-server/src/test/python/stacks/2.5/ZEPPELIN/test_zeppelin_060.py
@@ -238,7 +238,7 @@ class TestZeppelin060(RMFTestCase):
     )
     self.assertResourceCalled('HdfsResource', '/user/zeppelin',
         security_enabled = True,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.2.1.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
         hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
@@ -248,14 +248,14 @@ class TestZeppelin060(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         recursive_chown = True,
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.2.1.0-2067/hadoop/conf',
         type = 'directory',
         action = ['create_on_execute'],
         recursive_chmod = True,
     )
     self.assertResourceCalled('HdfsResource', '/user/zeppelin/test',
         security_enabled = True,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.2.1.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
         hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
@@ -265,14 +265,14 @@ class TestZeppelin060(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         recursive_chown = True,
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.2.1.0-2067/hadoop/conf',
         type = 'directory',
         action = ['create_on_execute'],
         recursive_chmod = True,
     )
     self.assertResourceCalled('HdfsResource', '/apps/zeppelin',
         security_enabled = True,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.2.1.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
         hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
@@ -282,14 +282,14 @@ class TestZeppelin060(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         recursive_chown = True,
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.2.1.0-2067/hadoop/conf',
         type = 'directory',
         action = ['create_on_execute'],
         recursive_chmod = True,
     )
     self.assertResourceCalled('HdfsResource', '/apps/zeppelin/tmp',
         security_enabled = True,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.2.1.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/tmp',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -301,14 +301,14 @@ class TestZeppelin060(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.2.1.0-2067/hadoop/conf',
         type = 'file',
         action = ['create_on_execute'],
         mode = 0444,
     )
     self.assertResourceCalled('HdfsResource', None,
         security_enabled = True,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.2.1.0-2067/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
         hdfs_resource_ignore_file = '/var/lib/ambari-agent/data/.hdfs_resource_ignore',
@@ -317,7 +317,7 @@ class TestZeppelin060(RMFTestCase):
         principal_name = UnknownConfigurationMock(),
         user = 'hdfs',
         action = ['execute'],
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.2.1.0-2067/hadoop/conf',
     )
     self.assertResourceCalled('File', '/etc/zeppelin/conf/interpreter.json',
         content=interpreter_json_generated.template_after_base,

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
index 103c86b..f7f054a 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
@@ -214,7 +214,7 @@
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
-        "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-801\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.5\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.5.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-801\",\"baseSaved\":true},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.21/repos/centos6\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.21\",\"repoName\":\"HDP-UTILS\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/centos6\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/centos6\",\"baseSaved\":true}]",
+        "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-777\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.5\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.5.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-777\",\"baseSaved\":true},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.21/repos/centos6\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.21\",\"repoName\":\"HDP-UTILS\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/centos6\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.21/repos/centos6\",\"baseSaved\":true}]",
         "package_list": "[{\"name\":\"ranger_${stack_version}-kms\",\"condition\":\"\",\"skipUpgrade\":false}]",
         "db_name": "ambari",
         "group_list": "[\"kms\",\"ranger\",\"hadoop\",\"users\"]",
@@ -230,7 +230,7 @@
         "service_package_folder": "common-services/RANGER_KMS/0.5.0.2.3/package",
         "script": "scripts/kms_server.py",
         "hooks_folder": "HDP/2.0.6/hooks",
-        "version": "2.5.0.0-801",
+        "version": "2.5.0.0-777",
         "max_duration_for_retries": "0",
         "command_retry_enabled": "false",
         "command_timeout": "600",
@@ -605,7 +605,7 @@
             "dfs.web.authentication.kerberos.keytab": "/etc/security/keytabs/spnego.service.keytab",
             "fs.permissions.umask-mode": "022",
             "dfs.namenode.stale.datanode.interval": "30000",
-            "dfs.datanode.ipc.address": "0.0.0.0:8010",
+            "dfs.datanode.ipc.address": "0.0.0.0:7770",
             "dfs.datanode.failed.volumes.tolerated": "0",
             "dfs.datanode.data.dir": "/grid/0/hadoop/hdfs/data",
             "dfs.namenode.http-address": "c6401.ambari.apache.org:50070",

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
index ca689b0..d8b9fe2 100644
--- a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
+++ b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
@@ -597,7 +597,7 @@ class TestDruid(RMFTestCase):
     self.assertResourceCalled('HdfsResource', '/user/druid',
                               immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                               security_enabled = False,
-                              hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               keytab = UnknownConfigurationMock(),
                               default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_site = {u'a': u'b'},
@@ -606,7 +606,7 @@ class TestDruid(RMFTestCase):
                               user = 'hdfs',
                               owner = 'druid',
                               group='hadoop',
-                              hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type = 'directory',
                               action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               dfs_type = '',
@@ -617,7 +617,7 @@ class TestDruid(RMFTestCase):
     self.assertResourceCalled('HdfsResource', '/user/druid/data',
                               immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                               security_enabled = False,
-                              hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               keytab = UnknownConfigurationMock(),
                               default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_site = {u'a': u'b'},
@@ -625,7 +625,7 @@ class TestDruid(RMFTestCase):
                               principal_name = 'missing_principal',
                               user = 'hdfs',
                               owner = 'druid',
-                              hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type = 'directory',
                               action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               dfs_type = '',
@@ -634,7 +634,7 @@ class TestDruid(RMFTestCase):
                               )
     self.assertResourceCalled('HdfsResource', '/tmp',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         dfs_type = '',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -644,7 +644,7 @@ class TestDruid(RMFTestCase):
         principal_name = 'missing_principal',
         user = 'hdfs',
         owner = 'hdfs',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'directory',
         action = ['create_on_execute'],
         immutable_paths = [u'/apps/hive/warehouse',
@@ -657,7 +657,7 @@ class TestDruid(RMFTestCase):
     self.assertResourceCalled('HdfsResource', '/tmp/druid-indexing',
                               immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                               security_enabled = False,
-                              hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               keytab = UnknownConfigurationMock(),
                               default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_site = {u'a': u'b'},
@@ -666,7 +666,7 @@ class TestDruid(RMFTestCase):
                               user = 'hdfs',
                               owner = 'druid',
                               group='hadoop',
-                              hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type = 'directory',
                               action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               dfs_type = '',
@@ -676,7 +676,7 @@ class TestDruid(RMFTestCase):
     self.assertResourceCalled('HdfsResource', '/user/druid/logs',
                               immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                               security_enabled = False,
-                              hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               keytab = UnknownConfigurationMock(),
                               default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_site = {u'a': u'b'},
@@ -685,7 +685,7 @@ class TestDruid(RMFTestCase):
                               user = 'hdfs',
                               owner = 'druid',
                               group='hadoop',
-                              hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type = 'directory',
                               action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               dfs_type = '',

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.6/SPARK2/test_spark_livy2.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/SPARK2/test_spark_livy2.py b/ambari-server/src/test/python/stacks/2.6/SPARK2/test_spark_livy2.py
index c370bbc..60e7fd2 100644
--- a/ambari-server/src/test/python/stacks/2.6/SPARK2/test_spark_livy2.py
+++ b/ambari-server/src/test/python/stacks/2.6/SPARK2/test_spark_livy2.py
@@ -56,7 +56,7 @@ class TestSparkClient(RMFTestCase):
         self.assertResourceCalled('HdfsResource', '/user/livy',
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -64,7 +64,7 @@ class TestSparkClient(RMFTestCase):
                                   principal_name = UnknownConfigurationMock(),
                                   user = 'hdfs',
                                   owner = 'livy',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   type = 'directory',
                                   action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
@@ -73,7 +73,7 @@ class TestSparkClient(RMFTestCase):
         self.assertResourceCalled('HdfsResource', None,
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -82,12 +82,12 @@ class TestSparkClient(RMFTestCase):
                                   user = 'hdfs',
                                   action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   )
         self.assertResourceCalled('HdfsResource', '/livy2-recovery',
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -95,7 +95,7 @@ class TestSparkClient(RMFTestCase):
                                   principal_name = UnknownConfigurationMock(),
                                   user = 'hdfs',
                                   owner = 'livy',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   type = 'directory',
                                   action = ['create_on_execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
@@ -104,7 +104,7 @@ class TestSparkClient(RMFTestCase):
         self.assertResourceCalled('HdfsResource', None,
                                   immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
                                   security_enabled = False,
-                                  hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+                                  hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
                                   keytab = UnknownConfigurationMock(),
                                   default_fs = 'hdfs://c6401.ambari.apache.org:8020',
                                   hdfs_site = {u'a': u'b'},
@@ -113,7 +113,7 @@ class TestSparkClient(RMFTestCase):
                                   user = 'hdfs',
                                   action = ['execute'], hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                                   dfs_type = '',
-                                  hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+                                  hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
                                   )
         self.assertResourceCalled('File', '/usr/hdp/current/livy2-server/conf/livy-env.sh',
                                   content = InlineTemplate(self.getConfig()['configurations']['livy2-env']['content']),

http://git-wip-us.apache.org/repos/asf/ambari/blob/31344fff/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index e0e4259..e8ef262 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -222,7 +222,7 @@ class TestZeppelin070(RMFTestCase):
                               sudo=True,
                               )
     self.assertResourceCalled('HdfsResource', '/user/zeppelin',
-                              hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               default_fs=u'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               hdfs_site={u'a': u'b'},
@@ -233,13 +233,13 @@ class TestZeppelin070(RMFTestCase):
                               principal_name=UnknownConfigurationMock(),
                               recursive_chown=True,
                               security_enabled=False,
-                              hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir='/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type='directory',
                               action=['create_on_execute'],
                               recursive_chmod=True
                               )
     self.assertResourceCalled('HdfsResource', '/user/zeppelin/test',
-                              hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               default_fs=u'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               hdfs_site={u'a': u'b'},
@@ -247,7 +247,7 @@ class TestZeppelin070(RMFTestCase):
                               user='hdfs',
                               owner='zeppelin',
                               recursive_chown=True,
-                              hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir='/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type='directory',
                               action=['create_on_execute'],
                               recursive_chmod=True,
@@ -256,7 +256,7 @@ class TestZeppelin070(RMFTestCase):
                               security_enabled=False,
                               )
     self.assertResourceCalled('HdfsResource', '/apps/zeppelin',
-                              hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               default_fs=u'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               hdfs_site={u'a': u'b'},
@@ -264,7 +264,7 @@ class TestZeppelin070(RMFTestCase):
                               user='hdfs',
                               owner='zeppelin',
                               recursive_chown=True,
-                              hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir='/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type='directory',
                               action=['create_on_execute'],
                               recursive_chmod=True,
@@ -273,7 +273,7 @@ class TestZeppelin070(RMFTestCase):
                               security_enabled=False,
                               )
     self.assertResourceCalled('HdfsResource', '/apps/zeppelin/tmp',
-                              hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               source='/tmp',
                               default_fs=u'hdfs://c6401.ambari.apache.org:8020',
                               replace_existing_files=True,
@@ -283,7 +283,7 @@ class TestZeppelin070(RMFTestCase):
                               user='hdfs',
                               owner='zeppelin',
                               group='zeppelin',
-                              hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir='/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               type='file',
                               action=['create_on_execute'],
                               mode=0444,
@@ -292,14 +292,14 @@ class TestZeppelin070(RMFTestCase):
                               security_enabled=False,
                               )
     self.assertResourceCalled('HdfsResource', None,
-                              hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
+                              hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
                               default_fs=u'hdfs://c6401.ambari.apache.org:8020',
                               hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
                               hdfs_site={u'a': u'b'},
                               kinit_path_local='/usr/bin/kinit',
                               user='hdfs',
                               action=['execute'],
-                              hadoop_conf_dir='/usr/hdp/current/hadoop-client/conf',
+                              hadoop_conf_dir='/usr/hdp/2.5.0.0-1235/hadoop/conf',
                               keytab=UnknownConfigurationMock(),
                               principal_name=UnknownConfigurationMock(),
                               security_enabled=False,
@@ -307,7 +307,7 @@ class TestZeppelin070(RMFTestCase):
 
     self.assertResourceCalled('HdfsResource', '/etc/zeppelin/conf/interpreter.json',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -318,7 +318,7 @@ class TestZeppelin070(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'file',
         action = ['download_on_execute'],
     )
@@ -331,7 +331,7 @@ class TestZeppelin070(RMFTestCase):
 
     self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/etc/zeppelin/conf/interpreter.json',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -343,14 +343,14 @@ class TestZeppelin070(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'file',
         action = ['create_on_execute'],
     )
 
     self.assertResourceCalled('HdfsResource', '/etc/zeppelin/conf/interpreter.json',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -361,7 +361,7 @@ class TestZeppelin070(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'file',
         action = ['download_on_execute'],
     )
@@ -374,7 +374,7 @@ class TestZeppelin070(RMFTestCase):
 
     self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/etc/zeppelin/conf/interpreter.json',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -386,14 +386,14 @@ class TestZeppelin070(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'file',
         action = ['create_on_execute'],
     )
 
     self.assertResourceCalled('HdfsResource', '/etc/zeppelin/conf/interpreter.json',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -404,7 +404,7 @@ class TestZeppelin070(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'file',
         action = ['download_on_execute'],
     )
@@ -417,7 +417,7 @@ class TestZeppelin070(RMFTestCase):
 
     self.assertResourceCalled('HdfsResource', '/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
         security_enabled = False,
-        hadoop_bin_dir = '/usr/hdp/current/hadoop-client/bin',
+        hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
         keytab = UnknownConfigurationMock(),
         source = '/etc/zeppelin/conf/interpreter.json',
         default_fs = 'hdfs://c6401.ambari.apache.org:8020',
@@ -429,7 +429,7 @@ class TestZeppelin070(RMFTestCase):
         user = 'hdfs',
         owner = 'zeppelin',
         group = 'zeppelin',
-        hadoop_conf_dir = '/usr/hdp/current/hadoop-client/conf',
+        hadoop_conf_dir = '/usr/hdp/2.5.0.0-1235/hadoop/conf',
         type = 'file',
         action = ['create_on_execute'],
     )