Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B1D6417549 for ; Tue, 30 Sep 2014 12:54:49 +0000 (UTC) Received: (qmail 95467 invoked by uid 500); 30 Sep 2014 12:54:49 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 95438 invoked by uid 500); 30 Sep 2014 12:54:49 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 95429 invoked by uid 99); 30 Sep 2014 12:54:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2014 12:54:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 531CDA03BFB; Tue, 30 Sep 2014 12:54:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vbrodetskyi@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-7555. Update Oracle JDK7 >= u51.(vbrodetskyi) Date: Tue, 30 Sep 2014 12:54:49 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk ba530c8d3 -> 503d0f236 AMBARI-7555. Update Oracle JDK7 >= u51.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/503d0f23 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/503d0f23 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/503d0f23 Branch: refs/heads/trunk Commit: 503d0f236de254168f2767ec63af0e7d0981cdc0 Parents: ba530c8 Author: Vitaly Brodetskyi Authored: Tue Sep 30 12:04:10 2014 +0300 Committer: Vitaly Brodetskyi Committed: Tue Sep 30 12:04:10 2014 +0300 ---------------------------------------------------------------------- ambari-server/conf/unix/ambari.properties | 2 +- ambari-server/src/main/python/ambari-server.py | 2 +- .../src/test/python/stacks/1.3.2/configs/default.hbasedecom.json | 2 +- ambari-server/src/test/python/stacks/1.3.2/configs/default.json | 2 +- .../python/stacks/1.3.2/configs/default.non_gmetad_host.json | 2 +- .../src/test/python/stacks/1.3.2/configs/default_client.json | 2 +- ambari-server/src/test/python/stacks/1.3.2/configs/secured.json | 2 +- .../src/test/python/stacks/1.3.2/configs/secured_client.json | 2 +- .../test/python/stacks/1.3.2/configs/secured_no_jce_name.json | 2 +- .../stacks/1.3.2/hooks/before-INSTALL/test_before_install.py | 4 ++-- .../src/test/python/stacks/2.0.6/configs/default.hbasedecom.json | 2 +- ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 2 +- .../python/stacks/2.0.6/configs/default.non_gmetad_host.json | 2 +- .../src/test/python/stacks/2.0.6/configs/default_client.json | 2 +- .../src/test/python/stacks/2.0.6/configs/flume_target.json | 2 +- .../src/test/python/stacks/2.0.6/configs/ha_default.json | 2 +- .../src/test/python/stacks/2.0.6/configs/ha_secured.json | 2 +- ambari-server/src/test/python/stacks/2.0.6/configs/secured.json | 2 +- .../src/test/python/stacks/2.0.6/configs/secured_client.json | 2 +- .../test/python/stacks/2.0.6/configs/secured_no_jce_name.json | 2 +- .../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 4 ++-- ambari-server/src/test/python/stacks/2.1/configs/default.json | 2 +- ambari-server/src/test/python/stacks/2.1/configs/secured.json | 2 +- ambari-server/src/test/python/stacks/2.2/configs/default.json | 2 +- ambari-server/src/test/python/stacks/2.2/configs/secured.json | 2 +- ambari-web/app/assets/data/requests/host_check/jdk_name.json | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/conf/unix/ambari.properties ---------------------------------------------------------------------- diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties index f1bb88c..d37174f 100644 --- a/ambari-server/conf/unix/ambari.properties +++ b/ambari-server/conf/unix/ambari.properties @@ -21,7 +21,7 @@ resources.dir = /var/lib/ambari-server/resources custom.action.definitions = /var/lib/ambari-server/resources/custom_action_definitions jdk1.6.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-6u31-linux-x64.bin jce_policy1.6.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-6.zip -jdk1.7.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-7u45-linux-x64.tar.gz +jdk1.7.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-7u67-linux-x64.tar.gz jce_policy1.7.url=http://public-repo-1.hortonworks.com/ARTIFACTS/UnlimitedJCEPolicyJDK7.zip metadata.path=/var/lib/ambari-server/resources/stacks server.version.file=/var/lib/ambari-server/resources/version http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/main/python/ambari-server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 9059319..44cfd1b 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -390,7 +390,7 @@ ORACLE_DB_ID_TYPES = ["Service Name", "SID"] # jdk commands -JDK_NAMES = ["jdk-7u45-linux-x64.tar.gz", "jdk-6u31-linux-x64.bin"] +JDK_NAMES = ["jdk-7u67-linux-x64.tar.gz", "jdk-6u31-linux-x64.bin"] JDK_URL_PROPERTIES = ["jdk1.7.url", "jdk1.6.url"] JCE_URL_PROPERTIES = ["jce_policy1.7.url", "jce_policy1.6.url"] DEFAULT_JDK16_LOCATION = "/usr/jdk64/jdk1.6.0_31" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json index 38e1032..d49877a 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.hbasedecom.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json index c5c162f..c80723c 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar", http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json index d6a9754..27c3e23 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default.non_gmetad_host.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json b/ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json index ccf5a16..f08e986 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/default_client.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json index b04f6e1..99e88b8 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json index c8e0e3b..9fe6138 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_client.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json index 5fe506d..1edff14 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json +++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured_no_jce_name.json @@ -13,7 +13,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/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 a2d808b..4758630 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/before-INSTALL/test_before_install.py @@ -38,12 +38,12 @@ class TestHookBeforeInstall(RMFTestCase): repo_file_name='HDP', repo_template='repo_suse_rhel.j2' ) - self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz', + self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u67-linux-x64.tar.gz -o /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], environment = {'no_proxy': 'c6401.ambari.apache.org'} ) - self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz > /dev/null 2>&1', + self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz > /dev/null 2>&1', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], ) http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json index 1727d66..64bc031 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json @@ -10,7 +10,7 @@ "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/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 ef279b4..4e00086 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 @@ -11,7 +11,7 @@ "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari", http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json index 138cb80..24397b0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json @@ -10,7 +10,7 @@ "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json index 9103cdc..0de6e38 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json @@ -11,7 +11,7 @@ "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json index 898762e..853c73c 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json @@ -10,7 +10,7 @@ "stack_version": "2.0", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json index 466e9f8..cdfdeb5 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json @@ -15,7 +15,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json index 7ab5885..d4731ea 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json @@ -15,7 +15,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/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 8db2df2..d03be7a 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 @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json index 5edf545..c7b11ad 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json index 067d4c5..d05f796 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json @@ -13,7 +13,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/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 3581556..ec4db47 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py @@ -40,12 +40,12 @@ class TestHookBeforeInstall(RMFTestCase): ) self.assertResourceCalled('Package', 'unzip',) self.assertResourceCalled('Package', 'curl',) - self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz', + self.assertResourceCalled('Execute', 'mkdir -p /tmp/AMBARI-artifacts/ ; curl -kf -x \"\" --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u67-linux-x64.tar.gz -o /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], environment = {'no_proxy': 'c6401.ambari.apache.org'}, ) - self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/AMBARI-artifacts//jdk-7u45-linux-x64.tar.gz > /dev/null 2>&1', + self.assertResourceCalled('Execute', 'mkdir -p /usr/jdk64 ; cd /usr/jdk64 ; tar -xf /tmp/AMBARI-artifacts//jdk-7u67-linux-x64.tar.gz > /dev/null 2>&1', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], ) http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.1/configs/default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json index 64b716b..cdb70f4 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json @@ -10,7 +10,7 @@ "stack_version": "2.1", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index c344416..e9fd470 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json @@ -14,7 +14,7 @@ "stack_name": "HDP", "db_name": "ambari", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar", http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/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 07c4c32..2fbed67 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 @@ -10,7 +10,7 @@ "stack_version": "2.1", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/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 d7818bc..3080043 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 @@ -10,7 +10,7 @@ "stack_version": "2.1", "stack_name": "HDP", "ambari_db_rca_driver": "org.postgresql.Driver", - "jdk_name": "jdk-7u45-linux-x64.tar.gz", + "jdk_name": "jdk-7u67-linux-x64.tar.gz", "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari" http://git-wip-us.apache.org/repos/asf/ambari/blob/503d0f23/ambari-web/app/assets/data/requests/host_check/jdk_name.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/requests/host_check/jdk_name.json b/ambari-web/app/assets/data/requests/host_check/jdk_name.json index 9ca084a..f5d6f71 100644 --- a/ambari-web/app/assets/data/requests/host_check/jdk_name.json +++ b/ambari-web/app/assets/data/requests/host_check/jdk_name.json @@ -6,7 +6,7 @@ "properties" : { "java.home" : "/usr/jdk64/jdk1.7.0_58", "jdk_location" : "http://c6404.ambari.apache.org:8080/resources/", - "jdk.name": "jdk-7u45-linux-x64.tar.gz" + "jdk.name": "jdk-7u67-linux-x64.tar.gz" } } } \ No newline at end of file