foreman-tasks 6.0.0 → 6.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ruby_tests.yml +7 -18
- data/.rubocop.yml +1 -0
- data/app/controllers/foreman_tasks/tasks_controller.rb +18 -18
- data/app/lib/actions/trigger_proxy_batch.rb +2 -1
- data/app/models/foreman_tasks/remote_task.rb +5 -4
- data/lib/foreman_tasks/tasks/export_tasks.rake +26 -18
- data/lib/foreman_tasks/version.rb +1 -1
- data/locale/action_names.rb +2 -3
- data/locale/en/foreman_tasks.po +27 -3
- data/locale/foreman_tasks.pot +230 -176
- data/locale/fr/foreman_tasks.po +27 -3
- data/locale/ja/foreman_tasks.po +27 -3
- data/locale/zh_CN/foreman_tasks.po +27 -3
- data/test/unit/remote_task_test.rb +26 -0
- metadata +3 -3
data/locale/fr/foreman_tasks.po
CHANGED
@@ -57,6 +57,9 @@ msgstr "Le paramètre :after dans la section de nettoyage des tâches est obsol
|
|
57
57
|
msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
|
58
58
|
msgstr "Une tâche en pause représente un processus qui ne s'est pas terminé correctement. Toute tâche en état de pause peut entraîner une incohérence potentielle et doit être résolue."
|
59
59
|
|
60
|
+
msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
|
61
|
+
msgstr ""
|
62
|
+
|
60
63
|
msgid "Action"
|
61
64
|
msgstr "Action"
|
62
65
|
|
@@ -69,6 +72,9 @@ msgstr "Actif"
|
|
69
72
|
msgid "Active Filters:"
|
70
73
|
msgstr "Filtres actifs :"
|
71
74
|
|
75
|
+
msgid "Active or disabled recurring logic with purpose %s already exists"
|
76
|
+
msgstr ""
|
77
|
+
|
72
78
|
msgid "All %s tasks are selected. "
|
73
79
|
msgstr "Toutes les tâches %s sont sélectionnées. "
|
74
80
|
|
@@ -277,6 +283,9 @@ msgstr "Tâches Foreman"
|
|
277
283
|
msgid "Fri"
|
278
284
|
msgstr "Ven."
|
279
285
|
|
286
|
+
msgid "I understand that this may cause harm and have working database backups of all backend services."
|
287
|
+
msgstr ""
|
288
|
+
|
280
289
|
msgid "ID"
|
281
290
|
msgstr "ID"
|
282
291
|
|
@@ -428,9 +437,6 @@ msgstr "Multiplicateur des intervalles de sondage"
|
|
428
437
|
msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
|
429
438
|
msgstr "Multiplicateur de sondage qui est utilisé pour multiplier les intervalles de sondage par défaut. Il peut être utilisé pour éviter que les sondages ne soient trop fréquents pour des tâches de longue durée."
|
430
439
|
|
431
|
-
msgid "Preupgrade job"
|
432
|
-
msgstr ""
|
433
|
-
|
434
440
|
msgid "Proxy action retry count"
|
435
441
|
msgstr ""
|
436
442
|
|
@@ -443,6 +449,9 @@ msgstr "Tâches de proxy manquantes du smart proxy"
|
|
443
449
|
msgid "Proxy tasks batch size"
|
444
450
|
msgstr ""
|
445
451
|
|
452
|
+
msgid "Purpose"
|
453
|
+
msgstr ""
|
454
|
+
|
446
455
|
msgid "Raw"
|
447
456
|
msgstr "Brut"
|
448
457
|
|
@@ -488,6 +497,9 @@ msgstr "Le verrouillage requis est déjà utilisé par d'autres tâches en cours
|
|
488
497
|
msgid "Resource search_params requires resource_type and resource_id to be specified"
|
489
498
|
msgstr "Ressource search_params a besoin que resource_type et resource_id soient spécifiés"
|
490
499
|
|
500
|
+
msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
|
501
|
+
msgstr ""
|
502
|
+
|
491
503
|
msgid "Result"
|
492
504
|
msgstr "Résultat"
|
493
505
|
|
@@ -664,6 +676,12 @@ msgstr[1] "Il y a %{compte} de tâches en pause dans le système qui nécessiten
|
|
664
676
|
msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
|
665
677
|
msgstr "Cette action supprimera toutes les logiques récurrentes annulées. Veuillez noter que cette action ne peut pas être annulée."
|
666
678
|
|
679
|
+
msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
|
680
|
+
msgstr ""
|
681
|
+
|
682
|
+
msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
|
683
|
+
msgstr ""
|
684
|
+
|
667
685
|
msgid "Thu"
|
668
686
|
msgstr "Jeu."
|
669
687
|
|
@@ -718,6 +736,9 @@ msgstr "En se concentrant sur la dernière"
|
|
718
736
|
msgid "Yes"
|
719
737
|
msgstr "Oui"
|
720
738
|
|
739
|
+
msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
|
740
|
+
msgstr ""
|
741
|
+
|
721
742
|
msgid "You do not have permission"
|
722
743
|
msgstr ""
|
723
744
|
|
@@ -759,6 +780,9 @@ msgstr "est minute (plage: 0-59)"
|
|
759
780
|
msgid "is month (range: 1-12)"
|
760
781
|
msgstr "est mois (Plage: 1-12)"
|
761
782
|
|
783
|
+
msgid "is not a valid format"
|
784
|
+
msgstr ""
|
785
|
+
|
762
786
|
msgid "last"
|
763
787
|
msgstr "dernier"
|
764
788
|
|
data/locale/ja/foreman_tasks.po
CHANGED
@@ -57,6 +57,9 @@ msgstr "タスク消去のセクションの :after の設定は非推奨にな
|
|
57
57
|
msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
|
58
58
|
msgstr "一時停止タスクは、適切に終了していないプロセスを表します。一時停止状態のタスクは、一貫性に欠ける可能性があり、解決する必要があります。"
|
59
59
|
|
60
|
+
msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
|
61
|
+
msgstr ""
|
62
|
+
|
60
63
|
msgid "Action"
|
61
64
|
msgstr "アクション"
|
62
65
|
|
@@ -69,6 +72,9 @@ msgstr "アクティブ"
|
|
69
72
|
msgid "Active Filters:"
|
70
73
|
msgstr "アクティブなフィルター:"
|
71
74
|
|
75
|
+
msgid "Active or disabled recurring logic with purpose %s already exists"
|
76
|
+
msgstr ""
|
77
|
+
|
72
78
|
msgid "All %s tasks are selected. "
|
73
79
|
msgstr "%s の全タスクを選択します。"
|
74
80
|
|
@@ -277,6 +283,9 @@ msgstr "Foreman タスク"
|
|
277
283
|
msgid "Fri"
|
278
284
|
msgstr "金"
|
279
285
|
|
286
|
+
msgid "I understand that this may cause harm and have working database backups of all backend services."
|
287
|
+
msgstr ""
|
288
|
+
|
280
289
|
msgid "ID"
|
281
290
|
msgstr "ID"
|
282
291
|
|
@@ -428,9 +437,6 @@ msgstr "ポーリングの間隔乗数"
|
|
428
437
|
msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
|
429
438
|
msgstr "デフォルトのポーリングの間隔を乗算するときに使用するポーリング乗数。この乗数を使用して、長期間にわたり実行中のタスクが頻繁にポーリングされるのを回避します。"
|
430
439
|
|
431
|
-
msgid "Preupgrade job"
|
432
|
-
msgstr ""
|
433
|
-
|
434
440
|
msgid "Proxy action retry count"
|
435
441
|
msgstr ""
|
436
442
|
|
@@ -443,6 +449,9 @@ msgstr "Smart Proxy のプロキシータスクが見つかりません"
|
|
443
449
|
msgid "Proxy tasks batch size"
|
444
450
|
msgstr ""
|
445
451
|
|
452
|
+
msgid "Purpose"
|
453
|
+
msgstr ""
|
454
|
+
|
446
455
|
msgid "Raw"
|
447
456
|
msgstr "ロー"
|
448
457
|
|
@@ -488,6 +497,9 @@ msgstr "必要なロックは、実行中の他のタスクにより取得済み
|
|
488
497
|
msgid "Resource search_params requires resource_type and resource_id to be specified"
|
489
498
|
msgstr "リソース search_params では resource_type と resource_id を指定する必要があります"
|
490
499
|
|
500
|
+
msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
|
501
|
+
msgstr ""
|
502
|
+
|
491
503
|
msgid "Result"
|
492
504
|
msgstr "結果"
|
493
505
|
|
@@ -664,6 +676,12 @@ msgstr[1] ""
|
|
664
676
|
msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
|
665
677
|
msgstr "このアクションは、キャンセル済みの再帰論理をすべて削除します。この操作は元に戻すことはできません。注意してください。"
|
666
678
|
|
679
|
+
msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
|
680
|
+
msgstr ""
|
681
|
+
|
682
|
+
msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
|
683
|
+
msgstr ""
|
684
|
+
|
667
685
|
msgid "Thu"
|
668
686
|
msgstr "木"
|
669
687
|
|
@@ -718,6 +736,9 @@ msgstr "フォーカスする時間: 過去 "
|
|
718
736
|
msgid "Yes"
|
719
737
|
msgstr "はい"
|
720
738
|
|
739
|
+
msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
|
740
|
+
msgstr ""
|
741
|
+
|
721
742
|
msgid "You do not have permission"
|
722
743
|
msgstr ""
|
723
744
|
|
@@ -759,6 +780,9 @@ msgstr "分 (範囲: 0〜59)"
|
|
759
780
|
msgid "is month (range: 1-12)"
|
760
781
|
msgstr "月 (範囲: 1〜12)"
|
761
782
|
|
783
|
+
msgid "is not a valid format"
|
784
|
+
msgstr ""
|
785
|
+
|
762
786
|
msgid "last"
|
763
787
|
msgstr "過去"
|
764
788
|
|
@@ -56,6 +56,9 @@ msgstr ":在任务清理部分中的设置弃用之后,使用 :after in :
|
|
56
56
|
msgid "A paused task represents a process that has not finished properly. Any task in paused state can lead to potential inconsistency and needs to be resolved."
|
57
57
|
msgstr "暂停的任务代表未正确完成的进程。任何处于暂停状态的任务都可能导致潜在的不一致,需要被解决。"
|
58
58
|
|
59
|
+
msgid "A special label for tracking a recurring job. There can be only one active job with a given purpose at a time."
|
60
|
+
msgstr ""
|
61
|
+
|
59
62
|
msgid "Action"
|
60
63
|
msgstr "行动"
|
61
64
|
|
@@ -68,6 +71,9 @@ msgstr "活性"
|
|
68
71
|
msgid "Active Filters:"
|
69
72
|
msgstr "活跃的过滤器:"
|
70
73
|
|
74
|
+
msgid "Active or disabled recurring logic with purpose %s already exists"
|
75
|
+
msgstr ""
|
76
|
+
|
71
77
|
msgid "All %s tasks are selected. "
|
72
78
|
msgstr "已选择所有%s任务。 "
|
73
79
|
|
@@ -276,6 +282,9 @@ msgstr "Foreman 任务"
|
|
276
282
|
msgid "Fri"
|
277
283
|
msgstr "周五"
|
278
284
|
|
285
|
+
msgid "I understand that this may cause harm and have working database backups of all backend services."
|
286
|
+
msgstr ""
|
287
|
+
|
279
288
|
msgid "ID"
|
280
289
|
msgstr "ID"
|
281
290
|
|
@@ -427,9 +436,6 @@ msgstr "轮询间隔乘数"
|
|
427
436
|
msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
|
428
437
|
msgstr "轮询乘数,用于乘以默认轮询间隔。这可用于防止对长时间运行的任务进行过于频繁的轮询。"
|
429
438
|
|
430
|
-
msgid "Preupgrade job"
|
431
|
-
msgstr ""
|
432
|
-
|
433
439
|
msgid "Proxy action retry count"
|
434
440
|
msgstr ""
|
435
441
|
|
@@ -442,6 +448,9 @@ msgstr "代理任务在智能代理中丢失"
|
|
442
448
|
msgid "Proxy tasks batch size"
|
443
449
|
msgstr ""
|
444
450
|
|
451
|
+
msgid "Purpose"
|
452
|
+
msgstr ""
|
453
|
+
|
445
454
|
msgid "Raw"
|
446
455
|
msgstr "Raw"
|
447
456
|
|
@@ -487,6 +496,9 @@ msgstr "所需的锁定已由其他正在运行的任务获取。"
|
|
487
496
|
msgid "Resource search_params requires resource_type and resource_id to be specified"
|
488
497
|
msgstr "資源 search_params 需要指定 resource_type 與 resource_id"
|
489
498
|
|
499
|
+
msgid "Resources for %s task(s) will be unlocked and will not prevent other tasks from being run. As the task(s) might be still running, it should be avoided to use this unless you are really sure the task(s) got stuck."
|
500
|
+
msgstr ""
|
501
|
+
|
490
502
|
msgid "Result"
|
491
503
|
msgstr "结果"
|
492
504
|
|
@@ -663,6 +675,12 @@ msgstr[1] ""
|
|
663
675
|
msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
|
664
676
|
msgstr "此操作将删除所有取消的重复逻辑。请注意,此操作无法撤消。"
|
665
677
|
|
678
|
+
msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
|
679
|
+
msgstr ""
|
680
|
+
|
681
|
+
msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
|
682
|
+
msgstr ""
|
683
|
+
|
666
684
|
msgid "Thu"
|
667
685
|
msgstr "周四"
|
668
686
|
|
@@ -717,6 +735,9 @@ msgstr "专注于最后"
|
|
717
735
|
msgid "Yes"
|
718
736
|
msgstr "是"
|
719
737
|
|
738
|
+
msgid "You can find resource locks on this page. Exclusive lock marked with locked icon means that no other task can use locked resource while this task is running. Non-exclusive lock marked with unlocked icon means other tasks can access the resource freely, it is only used to indicate the relation of this task with the resource"
|
739
|
+
msgstr ""
|
740
|
+
|
720
741
|
msgid "You do not have permission"
|
721
742
|
msgstr ""
|
722
743
|
|
@@ -758,6 +779,9 @@ msgstr "是分鐘(範圍:0-59)"
|
|
758
779
|
msgid "is month (range: 1-12)"
|
759
780
|
msgstr "是月份(範圍:1-12)"
|
760
781
|
|
782
|
+
msgid "is not a valid format"
|
783
|
+
msgstr ""
|
784
|
+
|
761
785
|
msgid "last"
|
762
786
|
msgstr "最近"
|
763
787
|
|
@@ -28,6 +28,32 @@ module ForemanTasks
|
|
28
28
|
_(remote_task.remote_task_id).must_equal((remote_task.id + 5).to_s)
|
29
29
|
end
|
30
30
|
end
|
31
|
+
|
32
|
+
it 'honors the batches with multiple proxies' do
|
33
|
+
remote_task = remote_tasks.last
|
34
|
+
remote_task.proxy_url = 'something else'
|
35
|
+
|
36
|
+
results = remote_tasks.reduce({}) do |acc, cur|
|
37
|
+
acc.merge(cur.execution_plan_id.to_s => { 'task_id' => cur.id + 5, 'result' => 'success' })
|
38
|
+
end
|
39
|
+
other_results = { remote_task.execution_plan_id => results.delete(remote_task.execution_plan_id) }
|
40
|
+
|
41
|
+
fake_proxy = mock
|
42
|
+
fake_proxy.expects(:launch_tasks).returns(results)
|
43
|
+
|
44
|
+
another_fake_proxy = mock
|
45
|
+
another_fake_proxy.expects(:launch_tasks).returns(other_results)
|
46
|
+
|
47
|
+
remote_tasks.first.expects(:proxy).returns(fake_proxy)
|
48
|
+
remote_tasks.last.expects(:proxy).returns(another_fake_proxy)
|
49
|
+
|
50
|
+
RemoteTask.batch_trigger('a_operation', remote_tasks)
|
51
|
+
remote_tasks.each do |remote_task|
|
52
|
+
remote_task.reload
|
53
|
+
_(remote_task.state).must_equal 'triggered'
|
54
|
+
_(remote_task.remote_task_id).must_equal((remote_task.id + 5).to_s)
|
55
|
+
end
|
56
|
+
end
|
31
57
|
end
|
32
58
|
end
|
33
59
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman-tasks
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.0.
|
4
|
+
version: 6.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ivan Nečas
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 1980-01-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: dynflow
|
@@ -608,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
608
608
|
- !ruby/object:Gem::Version
|
609
609
|
version: '0'
|
610
610
|
requirements: []
|
611
|
-
rubygems_version: 3.
|
611
|
+
rubygems_version: 3.2.26
|
612
612
|
signing_key:
|
613
613
|
specification_version: 4
|
614
614
|
summary: Foreman plugin for showing tasks information for resources and users
|