diff --git a/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml b/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml index ae2f2f64ee2de200456de99083aa6d666b94aa43..1cbbc02af59dfc9303b1a22c82ebe0bb47221ba5 100644 --- a/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml +++ b/bt5/erp5_upgrader/PathTemplateItem/portal_alarms/upgrader_controller.xml @@ -21,10 +21,8 @@ <item> <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 -1) system_upgrader (supported)\n -2) product_upgrader (supported)\n -3) bt5_upgrader (supported)\n -4) finalize_upgrader (supported)\n +1) bt5_upgrader (supported)\n +2) finalize_upgrader (supported)\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> </item> diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml index 8a90ebe9a0601d8baf01be663caefe052ce9c9dd..1097be27c0a2834f8868f85bf4ac2181bfad1e3f 100644 --- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml +++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeBT5Version.xml @@ -73,18 +73,6 @@ active_process = active_process.getPath()\n \n message_list = []\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 message_list.extend(context.ERP5Site_upgradeBusinessTemplateList(upgrade=1))\n \n diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml index 0a21ad77c765acdd58bf425c8616b08716195164..2f9d533bfcba026ae10a52928554c78bba9131ec 100644 --- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml +++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml @@ -58,12 +58,8 @@ """\n \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 ALARM_DICT = {\n - "system_upgrader" : False,\n - "product_upgrader" : False,\n "bt5_upgrader" : True,\n "finalize_upgrader" : True\n }\n diff --git a/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py b/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py index bcbe7eb8e07dfab4e3823456a267b3ebce1c6866..f24d93ee96eb865b99ee3b7908920e50a40d6564 100644 --- a/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py +++ b/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py @@ -118,8 +118,6 @@ class TestLiveUpgrader(ERP5TypeLiveTestCase): self.assertEquals(signature['alarm_tool_configuration_list'], ()) # 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']["finalize_upgrader"]) diff --git a/bt5/erp5_upgrader/bt/revision b/bt5/erp5_upgrader/bt/revision index bc6a950bffcdca9ee6558c3dc1acf6765157b5b4..83be903e06482de431c208dafff94d7f91c6f676 100644 --- a/bt5/erp5_upgrader/bt/revision +++ b/bt5/erp5_upgrader/bt/revision @@ -1 +1 @@ -569 \ No newline at end of file +570 \ No newline at end of file