Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf: job 插件默认超时限制与job 最新版本保持同步 #7551 #7559

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf: job 插件默认超时限制与job 最新版本保持同步 #7551 #7559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pipeline_plugins/components/collections/sites/open/job/fast_execute_script/v1_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,4 +322,5 @@ class JobFastExecuteScriptComponent(Component):
"插件版本V1.2新增滚动执行，ip tag分组默认为开。\n"
"注：插件版本v1.1中跨业务执行脚本时需要在作业平台添加白名单。\n"
"注：插件版本v1.2中滚动执行要求作业平台版本>=V3.6.0.0。\n"
"注：插件版本v1.2中超时限制[1, 259200]要求作业平台版本>=V3.7.5。\n"
)
6 changes: 3 additions & 3 deletions pipeline_plugins/components/static/components/atoms/job/fast_execute_script/v1_2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ job_start
type: "input",
attrs: {
name: gettext("超时时间"),
placeholder: gettext("单位为秒(1 - 86400)，为空时使用 JOB 默认值"),
placeholder: gettext("单位为秒(1 - 259200)，为空时使用 JOB 默认值"),
hookable: true,
validation: [
{
Expand All @@ -678,9 +678,9 @@ job_start
result.result = false;
result.error_message = gettext("超时时间必须为整数")
}
if (+value < 1 || +value > 86400) {
if (+value < 1 || +value > 259200) {
result.result = false;
result.error_message = gettext("超时时间必须在 1 - 86400 范围内")
result.error_message = gettext("超时时间必须在 1 - 259200 范围内")
}
return result
}
Expand Down
Loading