Commit 19b25a4a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

remove system_upgrader and product_upgrader completely.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43175 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f8d3cfb5
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>This alarms acts as a cron job. It will start an instance upgrade if any of the following this alarms sequence:\n <value> <string>This alarms acts as a cron job. It will start an instance upgrade if any of the following this alarms sequence:\n
1) system_upgrader (supported)\n 1) bt5_upgrader (supported)\n
2) product_upgrader (supported)\n 2) finalize_upgrader (supported)\n
3) bt5_upgrader (supported)\n
4) finalize_upgrader (supported)\n
\n \n
"sense" a need of an upgrade. This alarm is likely to disappear soon as it\'s needed due to lack of functionality (which is that alarms can not automatically "solve" themselves).</string> </value> "sense" a need of an upgrade. This alarm is likely to disappear soon as it\'s needed due to lack of functionality (which is that alarms can not automatically "solve" themselves).</string> </value>
</item> </item>
......
...@@ -73,18 +73,6 @@ active_process = active_process.getPath()\n ...@@ -73,18 +73,6 @@ active_process = active_process.getPath()\n
\n \n
message_list = []\n message_list = []\n
\n \n
system_upgrader_sense = portal_alarms.system_upgrader.sense()\n
product_upgrader_sense = portal_alarms.product_upgrader.sense()\n
\n
if system_upgrader_sense and product_upgrader_sense:\n
activate(active_process=active_process,\n
activity=\'SQLQueue\',\n
priority=2).Alarm_saveActiveResult(\n
summary="ERROR: Upgrade BT5 not started",\n
severity=0,\n
detail=\'System Upgrader Sense: %s , Product Upgrader Sense : %s\' \\\n
% ( system_upgrader_sense, product_upgrader_sense))\n
\n
# update existing bt5\n # update existing bt5\n
message_list.extend(context.ERP5Site_upgradeBusinessTemplateList(upgrade=1))\n message_list.extend(context.ERP5Site_upgradeBusinessTemplateList(upgrade=1))\n
\n \n
......
...@@ -58,12 +58,8 @@ ...@@ -58,12 +58,8 @@
"""\n """\n
\n \n
# Alarm dict is used to enable/disable upgrade alarms.\n # Alarm dict is used to enable/disable upgrade alarms.\n
# ie.: If you don\'t want upgrade products in some environments\n
# you can just define \'product_upgrader\' : False.\n
\n \n
ALARM_DICT = {\n ALARM_DICT = {\n
"system_upgrader" : False,\n
"product_upgrader" : False,\n
"bt5_upgrader" : True,\n "bt5_upgrader" : True,\n
"finalize_upgrader" : True\n "finalize_upgrader" : True\n
}\n }\n
......
...@@ -118,8 +118,6 @@ class TestLiveUpgrader(ERP5TypeLiveTestCase): ...@@ -118,8 +118,6 @@ class TestLiveUpgrader(ERP5TypeLiveTestCase):
self.assertEquals(signature['alarm_tool_configuration_list'], ()) self.assertEquals(signature['alarm_tool_configuration_list'], ())
# By default we upgrade software, products, bt5 and so on. # By default we upgrade software, products, bt5 and so on.
self.assertTrue(signature['alarm_dict']["system_upgrader"])
self.assertTrue(signature['alarm_dict']["product_upgrader"])
self.assertTrue(signature['alarm_dict']["bt5_upgrader"]) self.assertTrue(signature['alarm_dict']["bt5_upgrader"])
self.assertTrue(signature['alarm_dict']["finalize_upgrader"]) self.assertTrue(signature['alarm_dict']["finalize_upgrader"])
......
569 570
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment