You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/07/01 20:21:36 UTC
git commit: AMBARI-6339. Hive client download problems (reported in
forums) (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk ae5c25cf3 -> 6b52b54b1
AMBARI-6339. Hive client download problems (reported in forums) (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b52b54b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b52b54b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b52b54b
Branch: refs/heads/trunk
Commit: 6b52b54b1e2d6ddf1558129246195d7f26928e78
Parents: ae5c25c
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Jul 1 21:21:03 2014 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Jul 1 21:21:03 2014 +0300
----------------------------------------------------------------------
.../1.3.2/hooks/before-ANY/scripts/shared_initialization.py | 4 ++--
.../hooks/before-INSTALL/scripts/shared_initialization.py | 2 +-
.../1.3.2/hooks/before-START/scripts/shared_initialization.py | 4 ++--
.../stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py | 4 ++--
.../stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py | 2 +-
.../2.0.6/hooks/before-ANY/scripts/shared_initialization.py | 4 ++--
.../hooks/before-INSTALL/scripts/shared_initialization.py | 2 +-
.../2.0.6/hooks/before-START/scripts/shared_initialization.py | 4 ++--
.../stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py | 4 ++--
.../stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py | 2 +-
.../src/test/python/stacks/1.3.2/HIVE/test_hive_client.py | 6 +++---
.../src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py | 4 ++--
.../src/test/python/stacks/1.3.2/HIVE/test_hive_server.py | 4 ++--
.../stacks/1.3.2/hooks/before-INSTALL/test_before_install.py | 4 ++--
.../src/test/python/stacks/2.0.6/HIVE/test_hive_client.py | 4 ++--
.../src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py | 4 ++--
.../src/test/python/stacks/2.0.6/HIVE/test_hive_server.py | 4 ++--
.../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 2 +-
.../src/test/python/stacks/2.1/HIVE/test_hive_metastore.py | 4 ++--
19 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/shared_initialization.py
index 70a1623..74bdce0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/shared_initialization.py
@@ -36,7 +36,7 @@ def setup_jce():
if params.jce_policy_zip is not None:
jce_curl_target = format("{artifact_dir}/{jce_policy_zip}")
download_jce = format("mkdir -p {artifact_dir}; \
- curl -kf --retry 10 \
+ curl -kf -x \"\" --retry 10 \
{jce_location}/{jce_policy_zip} -o {jce_curl_target}")
Execute( download_jce,
path = ["/bin","/usr/bin/"],
@@ -55,4 +55,4 @@ def setup_jce():
only_if = format("test -e {security_dir} && test -f {jce_curl_target}"),
cwd = security_dir,
path = ['/bin/','/usr/bin']
- )
\ No newline at end of file
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
index 554db28..f88d429 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -154,7 +154,7 @@ def setup_java():
"no_proxy": format("{ambari_server_hostname}")
}
- Execute(format("mkdir -p {artifact_dir} ; curl -kf "
+ Execute(format("mkdir -p {artifact_dir} ; curl -kf -x \"\" "
"--retry 10 {jdk_location}/{jdk_name} -o {jdk_curl_target}"),
path = ["/bin","/usr/bin/"],
not_if = format("test -e {java_exec}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
index 07858ad..e545b02 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/shared_initialization.py
@@ -93,11 +93,11 @@ def setup_database():
}
if params.server_db_name == 'oracle' and params.oracle_driver_url != "":
db_driver_dload_cmd = format(
- "curl -kf --retry 5 {oracle_driver_symlink_url}"
+ "curl -kf -x \"\" --retry 5 {oracle_driver_symlink_url}"
" -o {hadoop_lib_home}/{db_driver_filename}")
elif params.server_db_name == 'mysql' and params.mysql_driver_url != "":
db_driver_dload_cmd = format(
- "curl -kf --retry 5 {mysql_driver_symlink_url} "
+ "curl -kf -x \"\" --retry 5 {mysql_driver_symlink_url} "
"-o {hadoop_lib_home}/{db_driver_filename}")
if db_driver_dload_cmd:
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
index 2efb5e2..0e44e77 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/hive.py
@@ -65,7 +65,7 @@ def hive(name=None):
"no_proxy": format("{ambari_server_hostname}")
}
- cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf "
+ cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" "
"--retry 5 "
"{jdk_location}{check_db_connection_jar_name} "
"-o {check_db_connection_jar_name}'")
@@ -177,7 +177,7 @@ def jdbc_connector():
}
cmd = format(
- "mkdir -p {artifact_dir} ; curl -kf --retry 10 {driver_curl_source} -o {driver_curl_target} && "
+ "mkdir -p {artifact_dir} ; curl -kf -x \"\" --retry 10 {driver_curl_source} -o {driver_curl_target} && "
"cp {driver_curl_target} {target}")
Execute(cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
index deb65f9..a073064 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/oozie.py
@@ -70,7 +70,7 @@ def oozie(is_server=False
params.jdbc_driver_name == "org.postgresql.Driver" or \
params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
Execute(format("/bin/sh -c 'cd /usr/lib/ambari-agent/ &&\
- curl -kf \
+ curl -kf -x \"\" \
--retry 5 {jdk_location}{check_db_connection_jar_name}\
-o {check_db_connection_jar_name}'"),
not_if = format("[ -f {check_db_connection_jar} ]"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index 70a1623..74bdce0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -36,7 +36,7 @@ def setup_jce():
if params.jce_policy_zip is not None:
jce_curl_target = format("{artifact_dir}/{jce_policy_zip}")
download_jce = format("mkdir -p {artifact_dir}; \
- curl -kf --retry 10 \
+ curl -kf -x \"\" --retry 10 \
{jce_location}/{jce_policy_zip} -o {jce_curl_target}")
Execute( download_jce,
path = ["/bin","/usr/bin/"],
@@ -55,4 +55,4 @@ def setup_jce():
only_if = format("test -e {security_dir} && test -f {jce_curl_target}"),
cwd = security_dir,
path = ['/bin/','/usr/bin']
- )
\ No newline at end of file
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
index 6116763..de8b5ff 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py
@@ -176,7 +176,7 @@ def setup_java():
}
Execute(format("mkdir -p {artifact_dir} ; \
- curl -kf \
+ curl -kf -x \"\" \
--retry 10 {jdk_location}/{jdk_name} -o {jdk_curl_target}"),
path = ["/bin","/usr/bin/"],
not_if = format("test -e {java_exec}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index 4a9bc42..4c08afb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -97,11 +97,11 @@ def setup_database():
}
if params.server_db_name == 'oracle' and params.oracle_driver_url != "":
db_driver_dload_cmd = format(
- "curl -kf \
+ "curl -kf -x \"\" \
--retry 5 {oracle_driver_symlink_url} -o {hadoop_lib_home}/{db_driver_filename}",)
elif params.server_db_name == 'mysql' and params.mysql_driver_url != "":
db_driver_dload_cmd = format(
- "curl -kf \
+ "curl -kf -x \"\" \
--retry 5 {mysql_driver_symlink_url} -o {hadoop_lib_home}/{db_driver_filename}")
if db_driver_dload_cmd:
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
index fc3e6bf..c98b8a1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py
@@ -71,7 +71,7 @@ def hive(name=None):
"no_proxy": format("{ambari_server_hostname}")
}
- cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf "
+ cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" "
"--retry 5 "
"{jdk_location}{check_db_connection_jar_name} "
"-o {check_db_connection_jar_name}'")
@@ -198,7 +198,7 @@ def jdbc_connector():
cmd = format(
"mkdir -p {artifact_dir} ; "
- "curl -kf --retry 10 {driver_curl_source} -o {driver_curl_target} && "
+ "curl -kf -x \"\" --retry 10 {driver_curl_source} -o {driver_curl_target} && "
"cp {driver_curl_target} {target}")
Execute(cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
index 8ea2b7b..3391d52 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
@@ -72,7 +72,7 @@ def oozie(is_server=False # TODO: see if see can remove this
params.jdbc_driver_name == "org.postgresql.Driver" or \
params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
Execute(format("/bin/sh -c 'cd /usr/lib/ambari-agent/ &&\
- curl -kf \
+ curl -kf -x \"\" \
--retry 5 {jdk_location}{check_db_connection_jar_name}\
-o {check_db_connection_jar_name}'"),
not_if = format("[ -f {check_db_connection_jar} ]"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
index b0d7605..115387f 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_client.py
@@ -40,7 +40,7 @@ class TestHiveClient(RMFTestCase):
conf_dir = '/etc/hive/conf',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -93,7 +93,7 @@ class TestHiveClient(RMFTestCase):
conf_dir = '/etc/hive/conf',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -124,4 +124,4 @@ class TestHiveClient(RMFTestCase):
owner='hive',
content='log4jproperties\nline2'
)
- self.assertNoMoreResources()
\ No newline at end of file
+ self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
index 1e285ce..6e632ad 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_metastore.py
@@ -176,7 +176,7 @@ class TestHiveMetastore(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -234,7 +234,7 @@ class TestHiveMetastore(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
index 778f108..ccebd87 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_server.py
@@ -222,7 +222,7 @@ class TestHiveServer(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -308,7 +308,7 @@ class TestHiveServer(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
index ce9dbbc..34f7b7e 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py
@@ -38,7 +38,7 @@ class TestHookBeforeInstall(RMFTestCase):
repo_file_name='HDP',
repo_template='repo_suse_rhel.j2'
)
- self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz',
+ self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz',
not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
path = ['/bin', '/usr/bin/'],
environment = {'no_proxy': 'c6401.ambari.apache.org'}
@@ -134,4 +134,4 @@ class TestHookBeforeInstall(RMFTestCase):
ignore_failures = False,
)
self.assertResourceCalled('Package', 'unzip',)
- self.assertNoMoreResources()
\ No newline at end of file
+ self.assertNoMoreResources()
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
index 15b692a..9554566 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_client.py
@@ -48,7 +48,7 @@ class TestHiveClient(RMFTestCase):
conf_dir = '/etc/hive/conf',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -109,7 +109,7 @@ class TestHiveClient(RMFTestCase):
conf_dir = '/etc/hive/conf',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
index 8313477..9f6ac52 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
@@ -168,7 +168,7 @@ class TestHiveMetastore(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -233,7 +233,7 @@ class TestHiveMetastore(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/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 6ef7bf87b..1cdd5aa 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
@@ -277,7 +277,7 @@ class TestHiveServer(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
@@ -371,7 +371,7 @@ class TestHiveServer(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'}
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
index 8227ff2..926a6c6 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py
@@ -40,7 +40,7 @@ class TestHookBeforeInstall(RMFTestCase):
)
self.assertResourceCalled('Package', 'unzip',)
self.assertResourceCalled('Package', 'curl',)
- self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz',
+ self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz',
not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
path = ['/bin', '/usr/bin/'],
environment = {'no_proxy': 'c6401.ambari.apache.org'},
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b52b54b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
index ba31c9e..359fb45 100644
--- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
@@ -126,7 +126,7 @@ class TestHiveMetastore(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'},
)
@@ -194,7 +194,7 @@ class TestHiveMetastore(RMFTestCase):
conf_dir = '/etc/hive/conf.server',
configurations = self.getConfig()['configurations']['hive-site'],
)
- self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
+ self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'",
not_if = '[ -f DBConnectionVerification.jar]',
environment = {'no_proxy': 'c6401.ambari.apache.org'},
)