AMBARI-9491 - Oozie Symlink Does Not Need To Be Removed During Upgrade (jonathanhurley)

ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server.py

@@ -158,7 +158,6 @@ class OozieServer(Script):
     Logger.info("Executing Oozie Server Rolling Upgrade pre-restart")
 
     oozie_server_upgrade.backup_configuration()
-    oozie_server_upgrade.pre_hdp_select()
 
     Execute(format("hdp-select set oozie-server {version}"))
 

ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py

@@ -65,15 +65,6 @@ def backup_configuration():
         tarball.close()
 
 
-def pre_hdp_select():
-  """
-  Removes /usr/bin/oozie which is required before running hdp-select
-  :return:
-  """
-  if os.path.isfile('/usr/bin/oozie'):
-    os.remove('/usr/bin/oozie')
-
-
 def restore_configuration():
   """
   Restores the configuration backups to their proper locations after an

ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py

@@ -637,13 +637,9 @@ class TestOozieServer(RMFTestCase):
     chmod_mock.assert_called_once_with('/usr/hdp/current/oozie-server/libext-customer', 511)
 
     self.assertTrue(isfile_mock.called)
-    self.assertEqual(isfile_mock.call_count,4)
+    self.assertEqual(isfile_mock.call_count,3)
     isfile_mock.assert_called_with('/usr/share/HDP-oozie/ext-2.2.zip')
 
-    self.assertTrue(remove_mock.called)
-    self.assertEqual(remove_mock.call_count,1)
-    remove_mock.assert_called_with('/usr/bin/oozie')
-
     self.assertTrue(glob_mock.called)
     self.assertEqual(glob_mock.call_count,1)
     glob_mock.assert_called_with('/usr/hdp/2.2.1.0-2135/hadoop/lib/hadoop-lzo*.jar')
@@ -692,13 +688,9 @@ class TestOozieServer(RMFTestCase):
     chmod_mock.assert_called_once_with('/usr/hdp/current/oozie-server/libext-customer', 511)
 
     self.assertTrue(isfile_mock.called)
-    self.assertEqual(isfile_mock.call_count,3)
+    self.assertEqual(isfile_mock.call_count,2)
     isfile_mock.assert_called_with('/usr/share/HDP-oozie/ext-2.2.zip')
 
-    self.assertTrue(remove_mock.called)
-    self.assertEqual(remove_mock.call_count,1)
-    remove_mock.assert_called_with('/usr/bin/oozie')
-
     self.assertResourceCalled('Execute', 'hdp-select set oozie-server 2.2.0.0-0000')
     self.assertResourceCalled('Execute', 'hdfs dfs -chown oozie:hadoop /user/oozie/share', user='oozie')
     self.assertResourceCalled('Execute', 'hdfs dfs -chmod -R 755 /user/oozie/share', user='oozie')