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 4600218612 for ; Mon, 21 Dec 2015 15:21:27 +0000 (UTC) Received: (qmail 68213 invoked by uid 500); 21 Dec 2015 15:21:27 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 68199 invoked by uid 500); 21 Dec 2015 15:21:26 -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 68190 invoked by uid 99); 21 Dec 2015 15:21:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Dec 2015 15:21:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9DA63E0570; Mon, 21 Dec 2015 15:21:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Message-Id: <1334b0f110bf42a395f0d8181652d77d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: Revert "AMBARI-14447. Fix slider install failure and review comments for AMBARI-14430 (aonishuk)" Date: Mon, 21 Dec 2015 15:21:25 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk d4adc1a9f -> 901d6afca Revert "AMBARI-14447. Fix slider install failure and review comments for AMBARI-14430 (aonishuk)" This reverts commit 1ad5db19470ee28f5acd6cd7b6313174dedc0b6a. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/901d6afc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/901d6afc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/901d6afc Branch: refs/heads/trunk Commit: 901d6afca459fa2d1bf66234f07b351f78266413 Parents: d4adc1a Author: Andrew Onishuk Authored: Mon Dec 21 17:20:56 2015 +0200 Committer: Andrew Onishuk Committed: Mon Dec 21 17:20:56 2015 +0200 ---------------------------------------------------------------------- .../resource_management/TestPackagesAnalyzer.py | 40 --------- .../libraries/functions/hdp_select.py | 19 ----- .../libraries/script/script.py | 58 ++++++------- .../custom_actions/scripts/install_packages.py | 4 +- .../stacks/HDP/2.2/services/FALCON/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/FLUME/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/HBASE/metainfo.xml | 8 +- .../stacks/HDP/2.2/services/HDFS/metainfo.xml | 40 ++++----- .../stacks/HDP/2.2/services/HIVE/metainfo.xml | 26 +++--- .../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/KNOX/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 8 +- .../stacks/HDP/2.2/services/PIG/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/RANGER/metainfo.xml | 8 +- .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 8 +- .../stacks/HDP/2.2/services/SPARK/metainfo.xml | 8 +- .../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/STORM/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/TEZ/metainfo.xml | 4 +- .../stacks/HDP/2.2/services/YARN/metainfo.xml | 14 ++-- .../HDP/2.3/services/ACCUMULO/metainfo.xml | 4 +- .../stacks/HDP/2.3/services/ATLAS/metainfo.xml | 4 +- .../stacks/HDP/2.3/services/HDFS/metainfo.xml | 71 ---------------- .../stacks/HDP/2.3/services/HIVE/metainfo.xml | 86 -------------------- .../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 8 +- .../stacks/HDP/2.3/services/PIG/metainfo.xml | 8 +- .../HDP/2.3/services/RANGER_KMS/metainfo.xml | 4 +- .../HDP/2.3/services/ZOOKEEPER/metainfo.xml | 8 +- .../custom_actions/TestInstallPackages.py | 6 +- .../configs/install_packages_config.json | 4 +- 30 files changed, 129 insertions(+), 347 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py deleted file mode 100644 index d9ddb38..0000000 --- a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py +++ /dev/null @@ -1,40 +0,0 @@ -''' -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -''' -from unittest import TestCase -from mock.mock import patch, MagicMock, call -from ambari_commons.os_check import OSCheck -from resource_management.libraries.functions import packages_analyzer - -class TestPackagesAnalyzer(TestCase): - @patch("resource_management.libraries.functions.packages_analyzer.rmf_shell.checked_call") - @patch.object(OSCheck, "is_ubuntu_family") - def test_get_installed_package_version_ubuntu(self, is_ubuntu_family_mock, checked_call_mock): - is_ubuntu_family_mock.return_value = True - checked_call_mock.return_value = (0, '1.2.3','') - result = packages_analyzer.getInstalledPackageVersion("package1") - self.assertEqual(result, '1.2.3') - self.assertEqual(checked_call_mock.call_args_list, [call("dpkg -s package1 | grep Version | awk '{print $2}'", stderr=-1)]) - - @patch("resource_management.libraries.functions.packages_analyzer.rmf_shell.checked_call") - @patch.object(OSCheck, "is_ubuntu_family") - def test_get_installed_package_version_centos_suse(self, is_ubuntu_family_mock, checked_call_mock): - is_ubuntu_family_mock.return_value = False - checked_call_mock.return_value = (0, '0.0.1-SNAPSHOT','') - result = packages_analyzer.getInstalledPackageVersion("package1") - self.assertEqual(result, '0.0.1-SNAPSHOT') - self.assertEqual(checked_call_mock.call_args_list, [call("rpm -q --queryformat '%{version}-%{release}' package1 | sed -e 's/\\.el[0-9]//g'", stderr=-1)]) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py index 5de9602..5628f33 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py @@ -20,7 +20,6 @@ limitations under the License. import os import sys -import re from resource_management.core.logger import Logger from resource_management.core.exceptions import Fail from resource_management.core.resources.system import Execute @@ -264,21 +263,3 @@ def get_hdp_versions(stack_root): if not versions: versions = get_versions_from_stack_root(stack_root) return versions - -def get_hdp_version_before_install(component_name): - """ - Works in the similar way to 'hdp-select status component', - but also works for not yet installed packages. - - Note: won't work if doing initial install. - """ - component_dir = HADOOP_HOME_DIR_TEMPLATE.format("current", component_name) - if os.path.islink(component_dir): - hdp_version = os.path.basename(os.path.dirname(os.readlink(component_dir))) - match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', hdp_version) - if match is None: - Logger.info('Failed to get extracted version with hdp-select in method get_hdp_version_before_install') - return None # lazy fail - return hdp_version - else: - return None http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-common/src/main/python/resource_management/libraries/script/script.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 7101386..3deb7a6 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -70,7 +70,7 @@ USAGE = """Usage: {0} 0: package_list = json.loads(package_list_str) for package in package_list: + #import pydevd;pydevd.settrace(host='192.168.64.1',stdoutToServer=True, stderrToServer=True) if not Script.matches_any_regexp(package['name'], exclude_packages): - name = self.format_package_name(package['name']) + name = Script.format_package_name(package['name']) # HACK: On Windows, only install ambari-metrics packages using Choco Package Installer # TODO: Update this once choco packages for hadoop are created. This is because, service metainfo.xml support # any which would cause installation failure on Windows. http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py index b1b4496..6b1c7f3 100644 --- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py +++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py @@ -342,9 +342,9 @@ class InstallPackages(Script): packages_were_checked = True filtered_package_list = self.filter_package_list(package_list) for package in filtered_package_list: - name = self.format_package_name(package['name']) + name = Script.format_package_name(package['name']) Package(name - # action="upgrade" # should we use "upgrade" action here, to upgrade not versioned packages? + # action="upgrade" - should we user ugrade action here? to updated not versioned packages? ) except Exception, err: ret_code = 1 http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml index 77b593b..e0e4c63 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml @@ -27,7 +27,7 @@ redhat7,redhat6,suse11 - falcon_${stack_version} + falcon_${hdp_version} @@ -35,7 +35,7 @@ debian7,ubuntu12,ubuntu14 - falcon-${stack_version} + falcon-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml index 48368ea..8d53e96 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml @@ -29,7 +29,7 @@ redhat7,redhat6,suse11 - flume_${stack_version} + flume_${hdp_version} @@ -37,7 +37,7 @@ debian7,ubuntu12,ubuntu14 - flume-${stack_version} + flume-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml index d80b5d1..ccefaf2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml @@ -28,10 +28,10 @@ redhat7,redhat6,suse11 - hbase_${stack_version} + hbase_${hdp_version} - phoenix_${stack_version} + phoenix_${hdp_version} @@ -39,10 +39,10 @@ debian7,ubuntu12,ubuntu14 - hbase-${stack_version} + hbase-${hdp_version} - phoenix-${stack_version} + phoenix-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml index ca4b5c5..f524685 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml @@ -22,13 +22,20 @@ HDFS HDFS 2.6.0.2.2 - - redhat6,suse11 + any + + + rpcbind + + + + + redhat7,redhat6,suse11 - hadoop_${stack_version} + hadoop_${hdp_version} snappy @@ -41,34 +48,34 @@ true - hadooplzo_${stack_version} + hadooplzo_${hdp_version} - hadoop_${stack_version}-libhdfs + hadoop_${hdp_version}-libhdfs - ubuntu12 + debian7,ubuntu12,ubuntu14 - hadoop-${stack_version}-client + hadoop-${hdp_version}-client - hadoop-${stack_version}-hdfs-datanode + hadoop-${hdp_version}-hdfs-datanode - hadoop-${stack_version}-hdfs-journalnode + hadoop-${hdp_version}-hdfs-journalnode - hadoop-${stack_version}-hdfs-namenode + hadoop-${hdp_version}-hdfs-namenode - hadoop-${stack_version}-hdfs-secondarynamenode + hadoop-${hdp_version}-hdfs-secondarynamenode - hadoop-${stack_version}-hdfs-zkfc + hadoop-${hdp_version}-hdfs-zkfc libsnappy1 @@ -77,19 +84,14 @@ libsnappy-dev - hadooplzo-${stack_version} - - - liblzo2-2 - true + hadooplzo-${hdp_version} - libhdfs0-${stack_version} + libhdfs0-${hdp_version} - theme.json http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml index ba87d8e..9d97946 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml @@ -55,7 +55,7 @@ - + any @@ -67,16 +67,19 @@ - redhat6,redhat7,suse11 + redhat7,redhat6,suse11 - hive_${stack_version} + hive_${hdp_version} + + + hive_${hdp_version}-hcatalog - hive_${stack_version}-hcatalog + hive_${hdp_version}-webhcat - hive_${stack_version}-webhcat + atlas-metadata_${hdp_version}-hive-plugin @@ -103,21 +106,24 @@ - ubuntu12 + debian7,ubuntu12,ubuntu14 - hive-${stack_version} + hive-${hdp_version} + + + hive-${hdp_version}-hcatalog - hive-${stack_version}-hcatalog + hive-${hdp_version}-webhcat - hive-${stack_version}-webhcat + atlas-metadata-${hdp_version}-hive-plugin - redhat6,ubuntu12 + redhat6,debian7,ubuntu12,ubuntu14 mysql-server http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml index 3268665..78b3021 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml @@ -26,7 +26,7 @@ redhat7,redhat6,suse11 - kafka_${stack_version} + kafka_${hdp_version} @@ -34,7 +34,7 @@ debian7,ubuntu12,ubuntu14 - kafka-${stack_version} + kafka-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml index 22b1be4..1b97334 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml @@ -26,7 +26,7 @@ redhat7,redhat6,suse11 - knox_${stack_version} + knox_${hdp_version} @@ -34,7 +34,7 @@ debian7,ubuntu12,ubuntu14 - knox-${stack_version} + knox-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml index d5db93c..d09d648 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml @@ -77,10 +77,10 @@ redhat5,redhat6,redhat7,suse11 - oozie_${stack_version} + oozie_${hdp_version} - falcon_${stack_version} + falcon_${hdp_version} @@ -88,10 +88,10 @@ debian7,ubuntu12,ubuntu14 - oozie-${stack_version} + oozie-${hdp_version} - falcon-${stack_version} + falcon-${hdp_version} extjs http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml index c4b9c8b..818640c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml @@ -27,7 +27,7 @@ redhat6,suse11 - pig_${stack_version} + pig_${hdp_version} @@ -35,7 +35,7 @@ ubuntu12 - pig-${stack_version} + pig-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml index b8edba5..8a4b335 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml @@ -35,10 +35,10 @@ redhat7,redhat6,suse11 - ranger_${stack_version}-admin + ranger_${hdp_version}-admin - ranger_${stack_version}-usersync + ranger_${hdp_version}-usersync @@ -46,10 +46,10 @@ debian7,ubuntu12,ubuntu14 - ranger-${stack_version}-admin + ranger-${hdp_version}-admin - ranger-${stack_version}-usersync + ranger-${hdp_version}-usersync http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml index dfab0d7..d6de7c8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml @@ -26,10 +26,10 @@ redhat7,redhat6,suse11 - slider_${stack_version} + slider_${hdp_version} - storm_${stack_version}-slider-client + storm_${hdp_version}-slider-client @@ -37,10 +37,10 @@ debian7,ubuntu12,ubuntu14 - slider-${stack_version} + slider-${hdp_version} - storm-${stack_version}-slider-client + storm-${hdp_version}-slider-client http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml index f370bf3..9f906a1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml @@ -30,10 +30,10 @@ redhat7,redhat6,suse11 - spark_${stack_version} + spark_${hdp_version} - spark_${stack_version}-python + spark_${hdp_version}-python @@ -41,10 +41,10 @@ debian7,ubuntu12,ubuntu14 - spark-${stack_version} + spark-${hdp_version} - spark-${stack_version}-python + spark-${hdp_version}-python http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml index eaa4051..b3c0e34 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml @@ -35,7 +35,7 @@ redhat7,redhat6,suse11 - sqoop_${stack_version} + sqoop_${hdp_version} @@ -43,7 +43,7 @@ debian7,ubuntu12,ubuntu14 - sqoop-${stack_version} + sqoop-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml index eca29ae..a0144d7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml @@ -34,7 +34,7 @@ redhat7,redhat6,suse11 - storm_${stack_version} + storm_${hdp_version} @@ -42,7 +42,7 @@ debian7,ubuntu12,ubuntu14 - storm-${stack_version} + storm-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml index 3f3a10c..3bb9aea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml @@ -28,7 +28,7 @@ redhat7,redhat6,suse11 - tez_${stack_version} + tez_${hdp_version} @@ -36,7 +36,7 @@ debian7,ubuntu12,ubuntu14 - tez-${stack_version} + tez-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml index bb346f0..20de188 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml @@ -35,13 +35,13 @@ redhat6,suse11 - hadoop_${stack_version}-yarn + hadoop_${hdp_version}-yarn - hadoop_${stack_version}-mapreduce + hadoop_${hdp_version}-mapreduce - hadoop_${stack_version}-hdfs + hadoop_${hdp_version}-hdfs @@ -49,10 +49,10 @@ ubuntu12 - hadoop-${stack_version}-yarn + hadoop-${hdp_version}-yarn - hadoop-${stack_version}-mapreduce + hadoop-${hdp_version}-mapreduce @@ -75,7 +75,7 @@ redhat6,suse11 - hadoop_${stack_version}-mapreduce + hadoop_${hdp_version}-mapreduce @@ -83,7 +83,7 @@ ubuntu12 - hadoop-${stack_version}-mapreduce + hadoop-${hdp_version}-mapreduce http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml index de6983c..d24d9b8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml @@ -27,7 +27,7 @@ redhat7,redhat6,suse11 - accumulo_${stack_version} + accumulo_${hdp_version} @@ -35,7 +35,7 @@ debian7,ubuntu12,ubuntu14 - accumulo-${stack_version} + accumulo-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml index 4983698..7e27659 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml @@ -27,7 +27,7 @@ redhat7,redhat6,suse11 - atlas-metadata_${stack_version} + atlas-metadata_${hdp_version} @@ -35,7 +35,7 @@ debian7,ubuntu12,ubuntu14 - atlas-metadata-${stack_version} + atlas-metadata-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml index cb0062f..8c992d2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml @@ -45,77 +45,6 @@ - - - - any - - - rpcbind - - - - - redhat7,redhat6,suse11 - - - hadoop_${stack_version} - - - snappy - - - snappy-devel - - - lzo - true - - - hadooplzo_${stack_version} - - - hadoop_${stack_version}-libhdfs - - - - - - debian7,ubuntu12,ubuntu14 - - - hadoop-${stack_version}-client - - - hadoop-${stack_version}-hdfs-datanode - - - hadoop-${stack_version}-hdfs-journalnode - - - hadoop-${stack_version}-hdfs-namenode - - - hadoop-${stack_version}-hdfs-secondarynamenode - - - hadoop-${stack_version}-hdfs-zkfc - - - libsnappy1 - - - libsnappy-dev - - - hadooplzo-${stack_version} - - - libhdfs0-${stack_version} - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml index f184741..0c70dbb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml @@ -21,92 +21,6 @@ HIVE 1.2.1.2.3 - - - - any - - - mysql-connector-java - true - - - - - redhat7,redhat6,suse11 - - - hive_${stack_version} - - - hive_${stack_version}-hcatalog - - - hive_${stack_version}-webhcat - - - atlas-metadata_${stack_version}-hive-plugin - - - - - redhat6,suse11 - - - mysql - true - - - - - redhat7 - - - mysql-community-release - true - - - mysql-community-server - true - - - - - debian7,ubuntu12,ubuntu14 - - - hive-${stack_version} - - - hive-${stack_version}-hcatalog - - - hive-${stack_version}-webhcat - - - atlas-metadata-${stack_version}-hive-plugin - - - - - redhat6,debian7,ubuntu12,ubuntu14 - - - mysql-server - true - - - - - suse11 - - - mysql-client - true - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml index 8d1dda1..12c8b5f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml @@ -48,10 +48,10 @@ redhat5,redhat6,redhat7,suse11 - oozie_${stack_version} + oozie_${hdp_version} - falcon_${stack_version} + falcon_${hdp_version} @@ -59,10 +59,10 @@ debian7,ubuntu12,ubuntu14 - oozie-${stack_version} + oozie-${hdp_version} - falcon-${stack_version} + falcon-${hdp_version} extjs http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml index 95830de..fe05cff 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml @@ -26,10 +26,10 @@ redhat7,redhat6,suse11 - pig_${stack_version} + pig_${hdp_version} - datafu_${stack_version} + datafu_${hdp_version} @@ -37,10 +37,10 @@ debian7,ubuntu12,ubuntu14 - pig-${stack_version} + pig-${hdp_version} - datafu-${stack_version} + datafu-${hdp_version} http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml index e3a9fd9..03768f0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml @@ -29,7 +29,7 @@ redhat7,redhat6,suse11 - ranger_${stack_version}-kms + ranger_${hdp_version}-kms @@ -37,7 +37,7 @@ debian7,ubuntu12,ubuntu14 - ranger-${stack_version}-kms + ranger-${hdp_version}-kms http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml index 315f319..3e27928 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml @@ -26,10 +26,10 @@ redhat6,suse11 - zookeeper_${stack_version} + zookeeper_${hdp_version} - zookeeper_${stack_version}-server + zookeeper_${hdp_version}-server @@ -37,10 +37,10 @@ ubuntu12 - zookeeper-${stack_version} + zookeeper-${hdp_version} - zookeeper-${stack_version}-server + zookeeper-${hdp_version}-server http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/test/python/custom_actions/TestInstallPackages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py index 679ae2a..39be4aa 100644 --- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py +++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py @@ -131,7 +131,7 @@ class TestInstallPackages(RMFTestCase): read_actual_version_from_history_file_mock, hdp_versions_mock, put_structured_out_mock, allInstalledPackages_mock, list_ambari_managed_repos_mock, is_suse_family_mock): is_suse_family_mock = True - Script.stack_version_from_distro_select = VERSION_STUB + Script.stack_version_from_hdp_select = VERSION_STUB hdp_versions_mock.side_effect = [ [], # before installation attempt [VERSION_STUB] @@ -197,7 +197,7 @@ class TestInstallPackages(RMFTestCase): [], # before installation attempt [VERSION_STUB] ] - Script.stack_version_from_distro_select = VERSION_STUB + Script.stack_version_from_hdp_select = VERSION_STUB allInstalledPackages_mock.side_effect = TestInstallPackages._add_packages list_ambari_managed_repos_mock.return_value=["HDP-UTILS-2.2.0.1-885"] is_redhat_family_mock.return_value = True @@ -327,7 +327,7 @@ class TestInstallPackages(RMFTestCase): hdp_versions_mock, allInstalledPackages_mock, put_structured_out_mock, package_mock, is_suse_family_mock): - Script.stack_version_from_distro_select = VERSION_STUB + Script.stack_version_from_hdp_select = VERSION_STUB hdp_versions_mock.side_effect = [ [], # before installation attempt [VERSION_STUB] http://git-wip-us.apache.org/repos/asf/ambari/blob/901d6afc/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json index fcd7765..24906cd 100644 --- a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json +++ b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json @@ -26,7 +26,7 @@ "stack_id": "HDP-2.2", "repository_version": "2.2.0.1-885", "base_urls": "[{\"name\":\"HDP-UTILS\",\"baseUrl\":\"http://repo1/HDP/centos5/2.x/updates/2.2.0.0\",\"repositoryId\":\"HDP-UTILS-1.1.0.20\"},{\"name\":\"HDP\",\"baseUrl\":\"http://repo1/HDP/centos5/2.x/updates/2.2.0.0\",\"repositoryId\":\"HDP-2.2\"}]", - "package_list": "[{\"name\":\"hadoop_${stack_version}\"},{\"name\":\"snappy\"},{\"name\":\"snappy-devel\"},{\"name\":\"lzo\"},{\"name\":\"hadooplzo_${stack_version}\"},{\"name\":\"hadoop_${stack_version}-libhdfs\"},{\"name\":\"ambari-log4j\"}]" + "package_list": "[{\"name\":\"hadoop_${hdp_version}\"},{\"name\":\"snappy\"},{\"name\":\"snappy-devel\"},{\"name\":\"lzo\"},{\"name\":\"hadooplzo_${hdp_version}\"},{\"name\":\"hadoop_${hdp_version}-libhdfs\"},{\"name\":\"ambari-log4j\"}]" }, "serviceName": "null", "role": "install_packages", @@ -44,7 +44,7 @@ "script_type": "PYTHON", "repository_version": "2.2.0.1-885", "base_urls": "[{\"name\":\"HDP-UTILS\",\"baseUrl\":\"http://repo1/HDP/centos5/2.x/updates/2.2.0.0\",\"repositoryId\":\"HDP-UTILS-1.1.0.20\"},{\"name\":\"HDP\",\"baseUrl\":\"http://repo1/HDP/centos5/2.x/updates/2.2.0.0\",\"repositoryId\":\"HDP-2.2\"}]", - "package_list": "[{\"name\":\"hadoop_${stack_version}\"},{\"name\":\"snappy\"},{\"name\":\"snappy-devel\"},{\"name\":\"lzo\"},{\"name\":\"hadooplzo_${stack_version}\"},{\"name\":\"hadoop_${stack_version}-libhdfs\"},{\"name\":\"ambari-log4j\"}]", + "package_list": "[{\"name\":\"hadoop_${hdp_version}\"},{\"name\":\"snappy\"},{\"name\":\"snappy-devel\"},{\"name\":\"lzo\"},{\"name\":\"hadooplzo_${hdp_version}\"},{\"name\":\"hadoop_${hdp_version}-libhdfs\"},{\"name\":\"ambari-log4j\"}]", "script": "install_packages.py" }, "commandId": "14-1",