ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject ambari git commit: AMBARI-11592. Unable to install stack HDP-2.3.0.0-2145 for RU (ncole)
Date Mon, 01 Jun 2015 20:02:03 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 94e965716 -> 994f6ccdc


AMBARI-11592. Unable to install stack HDP-2.3.0.0-2145 for RU (ncole)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/994f6ccd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/994f6ccd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/994f6ccd

Branch: refs/heads/trunk
Commit: 994f6ccdcd521329bbf604c3005851f22bb7d218
Parents: 94e9657
Author: Nate Cole <ncole@hortonworks.com>
Authored: Mon Jun 1 15:28:45 2015 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Mon Jun 1 15:47:13 2015 -0400

----------------------------------------------------------------------
 .../custom_actions/scripts/install_packages.py  |  4 +-
 .../custom_actions/TestInstallPackages.py       | 44 ++++++++++----------
 2 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/994f6ccd/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 9979fde..67d146c 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
@@ -65,7 +65,9 @@ class InstallPackages(Script):
 
     # Install/update repositories
     installed_repositories = []
-    current_repositories = ['base']  # Some our packages are installed from the base repo
+    # Some packages are installed from core repos
+    # rhui* is used for rhel, and base is for centos
+    current_repositories = ['rhui*','base']
     current_repo_files = set(['base'])
     old_versions = self.hdp_versions()
     

http://git-wip-us.apache.org/repos/asf/ambari/blob/994f6ccd/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 9735bc7..c0c547a 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -80,11 +80,11 @@ class TestInstallPackages(RMFTestCase):
                               mirror_list=None,
                               append_to_file=True,
     )
-    self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'hadoop_2_2_*-libhdfs', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'snappy', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'snappy-devel', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'hadoop_2_2_*-libhdfs', use_repos=['rhui*', 'base',
'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
     self.assertNoMoreResources()
 
 
@@ -128,11 +128,11 @@ class TestInstallPackages(RMFTestCase):
                               mirror_list=None,
                               append_to_file=True,
     )
-    self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'hadoop_2_2_*-libhdfs', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'hadoop_2_2_*', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'snappy', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'snappy-devel', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'hadoop_2_2_*-libhdfs', use_repos=['rhui*', 'base',
'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
     self.assertNoMoreResources()
 
 
@@ -243,11 +243,11 @@ class TestInstallPackages(RMFTestCase):
                               mirror_list=None,
                               append_to_file=True,
                               )
-    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'])
-    self.assertResourceCalled('Package', 'snappy', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    self.assertResourceCalled('Package', 'snappy-devel', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
-    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'])
-    self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*', use_repos=['rhui*', 'base',
'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'snappy', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'snappy-devel', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'hadoop_2_2_0_1_885*-libhdfs', use_repos=['rhui*',
'base', 'HDP-UTILS-2.2.0.1-885', 'HDP-2.2.0.1-885'])
+    self.assertResourceCalled('Package', 'ambari-log4j', use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
'HDP-2.2.0.1-885'])
     self.assertNoMoreResources()
 
 
@@ -301,15 +301,15 @@ class TestInstallPackages(RMFTestCase):
                               append_to_file=True,
                               )
     self.assertResourceCalled('Package', 'hive_2_2_0_1_885*',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
     )
     self.assertResourceCalled('Package', 'hive_2_2_0_1_885*-hcatalog',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
     )
     self.assertResourceCalled('Package', 'hive_2_2_0_1_885*-webhcat',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
     )
     self.assertNoMoreResources()
@@ -359,19 +359,19 @@ class TestInstallPackages(RMFTestCase):
                               append_to_file=True,
                               )
     self.assertResourceCalled('Package', 'hive_2_2_0_1_885*',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
                               )
     self.assertResourceCalled('Package', 'hive_2_2_0_1_885*-hcatalog',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
                               )
     self.assertResourceCalled('Package', 'hive_2_2_0_1_885*-webhcat',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
                               )
     self.assertResourceCalled('Package', 'hadooplzo_2_2_2_0_2538-native',
-                              use_repos=['base', 'HDP-UTILS-2.2.0.1-885',
+                              use_repos=['rhui*', 'base', 'HDP-UTILS-2.2.0.1-885',
                                          'HDP-2.2.0.1-885'],
                               )
     self.assertNoMoreResources()


Mime
View raw message