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

bug: stage审核取消兼容数据处理 #9611 #9613

Merged
merged 2 commits into from
Nov 3, 2023
Merged

bug: stage审核取消兼容数据处理 #9611 #9613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd73e29
bug: stage审核取消兼容数据处理 #9611
Oct 26, 2023
00d6d81
bug: stage审核取消兼容数据处理 #9611
Oct 26, 2023
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
16 changes: 12 additions & 4 deletions ...-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/option/StageControlOption.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,28 @@ data class StageControlOption(
val enable: Boolean = true, // 是否启用该阶段
@ApiModelProperty("运行条件", required = false)
val runCondition: StageRunCondition = StageRunCondition.AFTER_LAST_FINISHED, // 运行条件
@ApiModelProperty("自定义变量", required = false)
val customVariables: List<NameAndValue>? = emptyList(), // 自定义变量
@ApiModelProperty("自定义条件", required = false)
val customCondition: String? = null, // 自定义条件

// 废弃旧数据字段
@ApiModelProperty("是否人工触发", required = false)
@Deprecated("被StagePauseCheck.manualTrigger代替")
val manualTrigger: Boolean? = false,
@ApiModelProperty("可触发用户，支持引用变量", required = false)
@Deprecated("被StagePauseCheck.reviewGroups代替")
var triggerUsers: List<String>? = null, // 可触发用户，支持引用变量
@ApiModelProperty("已通过审核", required = false)
@Deprecated("被StagePauseCheck.status代替")
var triggered: Boolean? = null, // 已通过审核
@ApiModelProperty("等待审核的超时时间", required = false)
@Deprecated("被StagePauseCheck.timeout代替")
val timeout: Int? = null, // 等待审核的超时时间
@ApiModelProperty("自定义变量", required = false)
val customVariables: List<NameAndValue>? = emptyList(), // 自定义变量
@ApiModelProperty("自定义条件", required = false)
val customCondition: String? = null, // 自定义条件
@ApiModelProperty("审核变量", required = false)
@Deprecated("被StagePauseCheck.reviewParams代替")
var reviewParams: List<ManualReviewParam>? = null, // 审核变量
@ApiModelProperty("审核说明", required = false)
@Deprecated("被StagePauseCheck.reviewDesc代替")
var reviewDesc: String? = null // 审核说明
)
2 changes: 1 addition & 1 deletion ...-base/src/main/kotlin/com/tencent/devops/process/engine/extend/DefaultModelCheckPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ open class DefaultModelCheckPlugin constructor(
}

private fun Stage.checkStageReviewers() {
if (stageControlOption?.manualTrigger != true && checkIn?.manualTrigger != true) {
if (checkIn?.manualTrigger != true) {
return
}
resetBuildOption()
Expand Down