You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/01/27 15:43:33 UTC
ambari git commit: AMBARI-9354. Oracle JDK fails to be distributed to
agents (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 2bb1eb2ae -> a913b50ed
AMBARI-9354. Oracle JDK fails to be distributed to agents (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a913b50e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a913b50e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a913b50e
Branch: refs/heads/trunk
Commit: a913b50edc54a63b0999bdc2fb6e86dafce74b7e
Parents: 2bb1eb2
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Jan 27 16:43:25 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Jan 27 16:43:25 2015 +0200
----------------------------------------------------------------------
.../HDP/2.0.6/hooks/before-INSTALL/scripts/shared_initialization.py | 1 +
.../python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a913b50e/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 ba4329c..dd2c57e 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
@@ -57,6 +57,7 @@ def setup_java():
)
Execute(chmod_cmd,
+ not_if = format("test -e {java_exec}"),
sudo = True,
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/a913b50e/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 a54c6a6..eeec7ff 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
@@ -47,6 +47,7 @@ class TestHookBeforeInstall(RMFTestCase):
)
self.assertResourceCalled('Directory', '/usr/jdk64',)
self.assertResourceCalled('Execute', ('chmod', 'a+x', u'/usr/jdk64'),
+ not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java',
sudo = True,
)
self.assertResourceCalled('Execute', 'mkdir -p /tmp/jdk && cd /tmp/jdk && tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz && sudo cp -r /tmp/jdk/* /usr/jdk64',