diff --git a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_runFullUpgrader.py b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_runFullUpgrader.py index 6d0f1af075477241c04dec99b919bde0cac94c8c..b94705f4340c92429d8b7adacf1cc0d80b21cec1 100644 --- a/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_runFullUpgrader.py +++ b/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_runFullUpgrader.py @@ -15,27 +15,39 @@ post_upgrade_tag = '%s-postupgrade' % tag active_process = context.newActiveProcess() -portal_alarms.upgrader_check_pre_upgrade.activate( - activity='SQLQueue', - tag=pre_upgrade_tag, -).activeSense(fixit=fixit, params={'tag': pre_upgrade_tag}) - -portal_alarms.upgrader_check_upgrader.activate( - activity='SQLQueue', - tag=upgrade_tag, - after_tag=pre_upgrade_tag, - ).activeSense(fixit=fixit, params={'tag': upgrade_tag}) +portal_alarms.upgrader_check_pre_upgrade.activeSense( + fixit=fixit, + activate_kw={ + 'activity': 'SQLQueue', + 'tag': pre_upgrade_tag, + }, + params={'tag': pre_upgrade_tag}, +) + +portal_alarms.upgrader_check_upgrader.activeSense( + fixit=fixit, + activate_kw={ + 'activity': 'SQLQueue', + 'tag': upgrade_tag, + 'after_tag': pre_upgrade_tag, + }, + params={'tag': upgrade_tag}, +) if fixit: - portal_alarms.upgrader_check_post_upgrade.activate( - activity='SQLQueue', - tag=post_upgrade_tag, - after_tag=upgrade_tag, - ).activeSense(fixit=fixit, params={'tag': post_upgrade_tag}) + portal_alarms.upgrader_check_post_upgrade.activeSense( + fixit=fixit, + activate_kw={ + 'activity': 'SQLQueue', + 'tag': post_upgrade_tag, + 'after_tag': upgrade_tag, + }, + params={'tag': post_upgrade_tag}, + ) # start another activity to collect the results from each upgrader step -context.activate(after_tag=post_upgrade_tag).Alarm_postFullUpgradeNeed( +context.activate(after_tag=(upgrade_tag, post_upgrade_tag)).Alarm_postFullUpgradeNeed( active_process=active_process.getRelativeUrl()) # Nothing else to do, so we can disable.