Browse Source

AMBARI-6214. Remove yum/zypper repo check on upgradestack (ncole)

Nate Cole 11 years ago
parent
commit
f85a13e2e0

+ 0 - 15
ambari-server/src/main/python/ambari-server.py

@@ -2625,20 +2625,6 @@ def upgrade_stack(args, stack_id, repo_url=None, repo_url_os=None):
     raise FatalException(4, err)
   check_database_name_property()
 
-  local_repo_check_commamd = ""
-  if OS_FAMILY == OSConst.DEBIAN_FAMILY:
-    raise FatalException(3, '"upgradestack" command not supported yet for Debian OS\'es family.')
-  elif OS_FAMILY == OSConst.REDHAT_FAMILY:
-    local_repo_check_commamd = 'yum repolist | grep "{0} "'
-  elif OS_FAMILY == OSConst.SUSE_FAMILY:
-    local_repo_check_commamd = 'zypper repos | grep "{0} "'
-
-  command = local_repo_check_commamd.format(stack_id)
-  (retcode, stdout, stderr) = run_in_shell(command)
-
-  if not retcode == 0 and repo_url is None:
-    raise FatalException(retcode, 'Repository for ' + stack_id + " is not existed")
-
   stack_name, stack_version = stack_id.split(STACK_NAME_VER_SEP)
   retcode, stdout, stderr = run_stack_upgrade(stack_name, stack_version, repo_url, repo_url_os)
 
@@ -2646,7 +2632,6 @@ def upgrade_stack(args, stack_id, repo_url=None, repo_url_os=None):
     raise FatalException(retcode, 'Error executing stack upgrade. ' + stderr)
 
 
-
 def load_stack_values(version, filename):
   import xml.etree.ElementTree as ET
   values = {}

+ 0 - 7
ambari-server/src/test/python/TestAmbariServer.py

@@ -2860,13 +2860,6 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
     # Testing calls if desired stack repo not existed
     run_in_shell_mock.return_value = 1, "", ""
     is_root_mock.return_value = True
-    try:
-      ambari_server.upgrade_stack(args, 'HDP-2.0')
-      self.fail("Should throw exception")
-    except FatalException as fe:
-      # Expected
-      self.assertTrue("Repository for HDP-2.0 is not existed" in fe.reason)
-      pass
 
     run_stack_upgrade_mock.reset_mock()