Repository: ambari Updated Branches: refs/heads/trunk 1901b395c -> 5ce4f5448
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml index ce3fb95..d813e7f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml @@ -21,79 +21,6 @@ <service> <name>HDFS</name> <version>2.7.1.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>any</osFamily> - <packages> - <package> - <name>rpcbind</name> - </package> - </packages> - </osSpecific> - - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>hadoop_2_4_*</name> - </package> - <package> - <name>snappy</name> - </package> - <package> - <name>snappy-devel</name> - </package> - <package> - <name>lzo</name> - <skipUpgrade>true</skipUpgrade> - </package> - <package> - <name>hadooplzo_2_4_*</name> - </package> - <package> - <name>hadoop_2_4_*-libhdfs</name> - </package> - </packages> - </osSpecific> - - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>hadoop-2-4-.*-client</name> - </package> - <package> - <name>hadoop-2-4-.*-hdfs-datanode</name> - </package> - <package> - <name>hadoop-2-4-.*-hdfs-journalnode</name> - </package> - <package> - <name>hadoop-2-4-.*-hdfs-namenode</name> - </package> - <package> - <name>hadoop-2-4-.*-hdfs-secondarynamenode</name> - </package> - <package> - <name>hadoop-2-4-.*-hdfs-zkfc</name> - </package> - <package> - <name>libsnappy1</name> - </package> - <package> - <name>libsnappy-dev</name> - </package> - <package> - <name>hadooplzo-2-4-.*</name> - </package> - <package> - <name>libhdfs0-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml index 5ad52b6..82bdc92 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml @@ -21,93 +21,6 @@ <service> <name>HIVE</name> <version>1.2.1.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>any</osFamily> - <packages> - <package> - <name>mysql-connector-java</name> - <skipUpgrade>true</skipUpgrade> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>hive_2_4_*</name> - </package> - <package> - <name>hive_2_4_*-hcatalog</name> - </package> - <package> - <name>hive_2_4_*-webhcat</name> - </package> - <package> - <name>atlas-metadata*-hive-plugin</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>redhat6,suse11</osFamily> - <packages> - <package> - <name>mysql</name> - <skipUpgrade>true</skipUpgrade> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>redhat7</osFamily> - <packages> - <package> - <name>mysql-community-release</name> - <skipUpgrade>true</skipUpgrade> - </package> - <package> - <name>mysql-community-server</name> - <skipUpgrade>true</skipUpgrade> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>hive-2-4-.*</name> - </package> - <package> - <name>hive-2-4-.*-hcatalog</name> - </package> - <package> - <name>hive-2-4-.*-webhcat</name> - </package> - <package> - <name>atlas-metadata.*-hive-plugin</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>redhat6,debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>mysql-server</name> - <skipUpgrade>true</skipUpgrade> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>suse11</osFamily> - <packages> - <package> - <name>mysql-client</name> - <skipUpgrade>true</skipUpgrade> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml index 90bc472..ac9ca69 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml @@ -21,24 +21,6 @@ <service> <name>KAFKA</name> <version>0.9.0.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>kafka_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>kafka-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml index e465d42..676bd80 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml @@ -21,24 +21,6 @@ <service> <name>KNOX</name> <version>0.6.0.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>knox_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>knox-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml index 2f09e88..34cfb87 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml @@ -21,50 +21,6 @@ <service> <name>OOZIE</name> <version>4.2.0.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>any</osFamily> - <packages> - <package> - <name>zip</name> - </package> - <package> - <name>mysql-connector-java</name> - <skipUpgrade>true</skipUpgrade> - </package> - <package> - <name>extjs</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>redhat5,redhat6,redhat7,suse11</osFamily> - <packages> - <package> - <name>oozie_2_4_*</name> - </package> - <package> - <name>falcon_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>oozie-2-4-.*</name> - </package> - <package> - <name>falcon-2-4-.*</name> - </package> - <package> - <name>libxml2-utils</name> - </package> - </packages> - </osSpecific> - - </osSpecifics> </service> </services> </metainfo> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml index 9ae1f42..074fee8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml @@ -21,30 +21,6 @@ <service> <name>PIG</name> <version>0.15.0.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>pig_2_4_*</name> - </package> - <package> - <name>datafu_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>pig-2-4-.*</name> - </package> - <package> - <name>datafu-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml index d76ad5c..811c5e9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml @@ -24,32 +24,6 @@ <service> <name>RANGER</name> <version>0.5.0.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>ranger_2_4_*-admin</name> - </package> - <package> - <name>ranger_2_4_*-usersync</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>ranger-2-4-.*-admin</name> - </package> - <package> - <name>ranger-2-4-.*-usersync</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml index a27bf31..60321ee 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml @@ -24,26 +24,6 @@ <service> <name>RANGER_KMS</name> <version>0.5.0.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>ranger_2_4_*-kms</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>ranger-2-4-.*-kms</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml index ff998f0..bb19ddd 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml @@ -21,30 +21,6 @@ <service> <name>SLIDER</name> <version>0.80.0.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>slider_2_4_*</name> - </package> - <package> - <name>storm_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>slider-2-4-.*</name> - </package> - <package> - <name>storm-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml index f4880e2..a1a47d5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml @@ -24,30 +24,6 @@ <service> <name>SPARK</name> <version>1.5.2.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>spark_2_4_*</name> - </package> - <package> - <name>spark_2_4_*-python</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>spark-2-4-.*</name> - </package> - <package> - <name>spark-2-4-.*-python</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml index 721cc33..24fe529 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml @@ -21,33 +21,6 @@ <service> <name>SQOOP</name> <version>1.4.6.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>any</osFamily> - <packages> - <package> - <name>mysql-connector-java</name> - <skipUpgrade>true</skipUpgrade> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>sqoop_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>sqoop-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml index 36b01e4..c4d7136 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml @@ -22,25 +22,6 @@ <service> <name>STORM</name> <version>0.10.0.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>storm_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>storm-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml index 356225e..e54381d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml @@ -21,26 +21,6 @@ <service> <name>TEZ</name> <version>0.7.0.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>tez_2_4_*</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>tez-2-4-.*</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml index c61a270..a9b47c4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml @@ -22,57 +22,11 @@ <service> <name>YARN</name> <version>2.7.1.2.4</version> - - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>hadoop_2_4_*-yarn</name> - </package> - <package> - <name>hadoop_2_4_*-mapreduce</name> - </package> - <package> - <name>hadoop_2_4_*-hdfs</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>hadoop-2-4-.*-yarn</name> - </package> - <package> - <name>hadoop-2-4-.*-mapreduce</name> - </package> - </packages> - </osSpecific> - </osSpecifics> </service> <service> <name>MAPREDUCE2</name> <version>2.7.1.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>hadoop_2_4_*-mapreduce</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>hadoop-2-4-.*-mapreduce</name> - </package> - </packages> - </osSpecific> - </osSpecifics> <configuration-dir>configuration-mapred</configuration-dir> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml index 4bf4198..04c7b54 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml @@ -21,31 +21,6 @@ <service> <name>ZOOKEEPER</name> <version>3.4.6.2.4</version> - <osSpecifics> - <osSpecific> - <osFamily>redhat7,redhat6,suse11</osFamily> - <packages> - <package> - <name>zookeeper_2_4_*</name> - </package> - <package> - <name>zookeeper_2_4_*-server</name> - </package> - </packages> - </osSpecific> - <osSpecific> - <osFamily>debian7,ubuntu12,ubuntu14</osFamily> - <packages> - <package> - <name>zookeeper-2-4-.*</name> - </package> - <package> - <name>zookeeper-2-4-.*-server</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 6d8c2f0..39be4aa 100644 --- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py +++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py @@ -29,6 +29,7 @@ from stacks.utils.RMFTestCase import * from mock.mock import patch, MagicMock from resource_management.core.base import Resource from resource_management.core.exceptions import Fail +from resource_management.libraries.script import Script OLD_VERSION_STUB = '2.1.0.0-400' VERSION_STUB_WITHOUT_BUILD_NUMBER = '2.2.0.1' @@ -109,15 +110,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'fuse') - self.assertResourceCalled('Package', 'fuse-libs') - self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'snappy', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'snappy-devel', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'lzo', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'hadooplzo_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'hadoop_2_2_*-libhdfs', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885') + self.assertResourceCalled('Package', 'snappy') + self.assertResourceCalled('Package', 'snappy-devel') + self.assertResourceCalled('Package', 'lzo') + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885') + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs') + self.assertResourceCalled('Package', 'ambari-log4j') self.assertNoMoreResources() @patch("ambari_commons.os_check.OSCheck.is_suse_family") @@ -131,6 +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_hdp_select = VERSION_STUB hdp_versions_mock.side_effect = [ [], # before installation attempt [VERSION_STUB] @@ -169,15 +170,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'fuse') - self.assertResourceCalled('Package', 'libfuse2') - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'lzo', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*-libhdfs', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885') + self.assertResourceCalled('Package', 'snappy') + self.assertResourceCalled('Package', 'snappy-devel') + self.assertResourceCalled('Package', 'lzo') + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885') + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs') + self.assertResourceCalled('Package', 'ambari-log4j') self.assertNoMoreResources() @@ -197,6 +197,7 @@ class TestInstallPackages(RMFTestCase): [], # before installation attempt [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 @@ -232,15 +233,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'fuse') - self.assertResourceCalled('Package', 'fuse-libs') - self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'snappy', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'snappy-devel', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'lzo', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'hadooplzo_2_2_*', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'hadoop_2_2_*-libhdfs', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) - self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=['HDP-*']) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885') + self.assertResourceCalled('Package', 'snappy') + self.assertResourceCalled('Package', 'snappy-devel') + self.assertResourceCalled('Package', 'lzo') + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885') + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs') + self.assertResourceCalled('Package', 'ambari-log4j') self.assertNoMoreResources() @@ -327,6 +327,7 @@ class TestInstallPackages(RMFTestCase): hdp_versions_mock, allInstalledPackages_mock, put_structured_out_mock, package_mock, is_suse_family_mock): + Script.stack_version_from_hdp_select = VERSION_STUB hdp_versions_mock.side_effect = [ [], # before installation attempt [VERSION_STUB] @@ -366,15 +367,14 @@ class TestInstallPackages(RMFTestCase): mirror_list=None, append_to_file=True, ) - self.assertResourceCalled('Package', 'fuse') - self.assertResourceCalled('Package', 'libfuse2') - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'lzo', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*-libhdfs', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) - self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'], skip_repos=[]) + self.assertResourceCalled('Package', 'hdp-select', action=["upgrade"]) + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885') + self.assertResourceCalled('Package', 'snappy') + self.assertResourceCalled('Package', 'snappy-devel') + self.assertResourceCalled('Package', 'lzo') + self.assertResourceCalled('Package', 'hadooplzo_2_2_0_1_885') + self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885-libhdfs') + self.assertResourceCalled('Package', 'ambari-log4j') self.assertNoMoreResources() http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 50e327a..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_2_2_*\"},{\"name\":\"snappy\"},{\"name\":\"snappy-devel\"},{\"name\":\"lzo\"},{\"name\":\"hadooplzo_2_2_*\"},{\"name\":\"hadoop_2_2_*-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_2_2_*\"},{\"name\":\"snappy\"},{\"name\":\"snappy-devel\"},{\"name\":\"lzo\"},{\"name\":\"hadooplzo_2_2_*\"},{\"name\":\"hadoop_2_2_*-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", http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index 5a95fe2..7c6d10e 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py @@ -35,20 +35,27 @@ class TestHBaseMaster(RMFTestCase): config_file="hbase_no_phx.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, - try_install=True + try_install=True, + checked_call_mocks = [(0, "OK.", ""),(0, "OK.", "")], ) self.assertResourceCalled('Package', 'hbase_2_3_*',) self.assertNoMoreResources() - + + + #@patch('resource_management.libraries.functions.packages_analyzer.rmf_shell.checked_call', new=('','','')) def test_install_hbase_master_default_with_phx(self): + #import resource_management + import itertools + #resource_management.libraries.functions.packages_analyzer.rmf_shell.checked_call = lambda a, b: '','','' self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/hbase_master.py", classname = "HbaseMaster", command = "install", config_file="hbase_with_phx.json", hdp_stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES, - try_install=True + try_install=True, + checked_call_mocks = [(0, "OK.", ""),(0, "OK.", "")], ) self.assertResourceCalled('Package', 'hbase_2_3_*',) self.assertResourceCalled('Package', 'phoenix_2_3_*',)
