Skip to content

Commit

Permalink
Merge branch 'issue_9597' of https://github.com/tangruotian/bk-ci int…
Browse files Browse the repository at this point in the history 
…o issue_9597
  • Loading branch information
@tangruotian
tangruotian committed Dec 1, 2023
2 parents 02013a2 + b7bbe36 commit 5c47ad8
Show file tree
Hide file tree
Showing 35 changed files with 429 additions and 173 deletions.
48 changes: 24 additions & 24 deletions src/agent/agent/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,64 +38,64 @@ macos_no_cgo: build_macos_no_cgo build_macos_arm64_no_cgo

build_linux: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_linux $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_linux $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_linux $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_linux $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_linux $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_linux $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_linux $(CMDDIR)/installer/main.go
ls -la $(BINDIR)
build_linux_arm64: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_linux_arm64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_linux_arm64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_linux_arm64 $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_linux_arm64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_linux_arm64 $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_linux_arm64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_linux_arm64 $(CMDDIR)/installer/main.go
ls -la $(BINDIR)
build_linux_mips64: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_linux_mips64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_linux_mips64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_linux_mips64 $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_linux_mips64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_linux_mips64 $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_linux_mips64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=mips64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_linux_mips64 $(CMDDIR)/installer/main.go
ls -la $(BINDIR)

# Telegraf 的 cpu和diskio 插件采集使用的 shirou 包需要开启cgo才可以在darwin情况下采集成功
build_macos: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_macos $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_macos $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_macos $(CMDDIR)/installer/main.go
ls -la $(BINDIR)
build_macos_arm64: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos_arm64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos_arm64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_macos_arm64 $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos_arm64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_macos_arm64 $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos_arm64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_macos_arm64 $(CMDDIR)/installer/main.go
ls -la $(BINDIR)

# 方便统一交叉编译，这里会提供不开启cgo的macos编译，但是其监控的 cpu和diskio 会没有数据
build_macos_no_cgo: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_macos $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_macos $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_macos $(CMDDIR)/installer/main.go
ls -la $(BINDIR)
build_macos_arm64_no_cgo: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos_arm64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon_macos_arm64 $(CMDDIR)/daemon/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent_macos_arm64 $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos_arm64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build ${BUILD_FLAGS} -o $(BINDIR)/installer_macos_arm64 $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader_macos_arm64 $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer_macos_arm64 $(CMDDIR)/installer/main.go
ls -la $(BINDIR)

build_windows: test clean i18nfilegen
mkdir -p $(BINDIR)
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon.exe $(CMDDIR)/daemon/main_win.go
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsDaemon.exe $(CMDDIR)/daemon/main_win.go
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/devopsAgent.exe $(CMDDIR)/agent/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build ${BUILD_FLAGS} -o $(BINDIR)/upgrader.exe $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build ${BUILD_FLAGS} -o $(BINDIR)/installer.exe $(CMDDIR)/installer/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/upgrader.exe $(CMDDIR)/upgrader/main.go
GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -tags=${BUILD_OUT_TAG} ${BUILD_FLAGS} -o $(BINDIR)/installer.exe $(CMDDIR)/installer/main.go
ls -la $(BINDIR)

clean:
Expand Down
19 changes: 19 additions & 0 deletions ...om/tencent/devops/common/pipeline/pojo/element/trigger/CodeGithubWebHookTriggerElement.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,25 @@ data class CodeGithubWebHookTriggerElement(
)
}

CodeEventType.REVIEW -> {
listOf(
TriggerElementPropUtils.selector(name = "includeCrState", value = includeCrState)
)
}

CodeEventType.ISSUES -> {
listOf(
TriggerElementPropUtils.selector(name = "includeIssueAction", value = includeIssueAction)
)
}

CodeEventType.NOTE -> {
listOf(
TriggerElementPropUtils.selector(name = "includeNoteTypes", value = includeNoteTypes),
TriggerElementPropUtils.vuexInput(name = "includeNoteComment", value = includeNoteComment)
)
}

else -> emptyList()
}
return props.filterNotNull()
Expand Down
4 changes: 2 additions & 2 deletions ...g/biz-log/src/main/kotlin/com/tencent/devops/log/resources/ServiceLogPrintResourceImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class ServiceLogPrintResourceImpl @Autowired constructor(
// #7168 通过一次获取创建记录以及缓存
val index = indexService.getIndexName(buildId)
logger.info("Start to print log to index[$index]")
buildLogPrintService.dispatchEvent(
buildLogPrintService.asyncDispatchEvent(
LogStatusEvent(
buildId = buildId,
finished = false,
Expand All @@ -102,7 +102,7 @@ class ServiceLogPrintResourceImpl @Autowired constructor(
logger.warn("Invalid build ID[$buildId]")
return Result(false)
}
buildLogPrintService.dispatchEvent(
buildLogPrintService.asyncDispatchEvent(
LogStatusEvent(
buildId = buildId,
finished = finished,
Expand Down
25 changes: 20 additions & 5 deletions .../core/log/biz-log/src/main/kotlin/com/tencent/devops/log/service/impl/LogServiceESImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,11 @@ class LogServiceESImpl(
if (exString.contains("index_closed_exception")) {
logger.warn("[$buildId] Can't search because of index_closed_exception", e)
queryLogs.status = LogStatus.CLOSED.status
} else if (exString.contains("Too Many Requests")) {
logger.warn("[$buildId] Too many query requests", e)
queryLogs.status = LogStatus.FAIL.status
}
} catch (ignore: Exception) {
} catch (ignore: Throwable) {
logger.warn("Query init logs failed because of ${ignore.javaClass}. buildId: $buildId", ignore)
queryLogs.status = LogStatus.FAIL.status
}
Expand Down Expand Up @@ -640,8 +643,11 @@ class LogServiceESImpl(
if (exString.contains("index_closed_exception")) {
logger.warn("[$buildId] Can't search because of index_closed_exception", e)
queryLogs.status = LogStatus.CLOSED.status
} else if (exString.contains("Too Many Requests")) {
logger.warn("[$buildId] Too many query requests", e)
queryLogs.status = LogStatus.FAIL.status
}
} catch (ignore: Exception) {
} catch (ignore: Throwable) {
logger.warn("Query end logs failed because of ${ignore.javaClass}. buildId: $buildId", ignore)
queryLogs.status = LogStatus.FAIL.status
}
Expand Down Expand Up @@ -707,8 +713,11 @@ class LogServiceESImpl(
if (exString.contains("index_closed_exception")) {
logger.warn("[$buildId] Can't search because of index_closed_exception", e)
queryLogs.status = LogStatus.CLOSED.status
} else if (exString.contains("Too Many Requests")) {
logger.warn("[$buildId] Too many query requests", e)
queryLogs.status = LogStatus.FAIL.status
}
} catch (ignore: Exception) {
} catch (ignore: Throwable) {
logger.warn("Query init logs failed because of ${ignore.javaClass}. buildId: $buildId", ignore)
queryLogs.status = LogStatus.FAIL.status
}
Expand Down Expand Up @@ -799,8 +808,11 @@ class LogServiceESImpl(
if (exString.contains("index_closed_exception")) {
logger.warn("[$buildId] Can't search because of index_closed_exception", e)
queryLogs.status = LogStatus.CLOSED.status
} else if (exString.contains("Too Many Requests")) {
logger.warn("[$buildId] Too many query requests", e)
queryLogs.status = LogStatus.FAIL.status
}
} catch (ignore: Exception) {
} catch (ignore: Throwable) {
logger.warn("Query after logs failed because of ${ignore.javaClass}. buildId: $buildId", ignore)
queryLogs.status = LogStatus.FAIL.status
queryLogs.finished = true
Expand Down Expand Up @@ -883,8 +895,11 @@ class LogServiceESImpl(
if (exString.contains("index_closed_exception")) {
logger.warn("[$buildId] Can't search because of index_closed_exception", e)
queryLogs.status = LogStatus.CLOSED.status
} else if (exString.contains("Too Many Requests")) {
logger.warn("[$buildId] Too many query requests", e)
queryLogs.status = LogStatus.FAIL.status
}
} catch (ignore: Exception) {
} catch (ignore: Throwable) {
logger.warn("Query before logs failed because of ${ignore.javaClass}. buildId: $buildId", ignore)
queryLogs.status = LogStatus.FAIL.status
queryLogs.finished = true
Expand Down
4 changes: 1 addition & 3 deletions ...ess/api-process/src/main/kotlin/com/tencent/devops/process/api/op/OpScmWebhookResource.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ interface OpScmWebhookResource {
fun updateWebhookEventInfo(
@ApiParam("待更新的项目ID", required = false)
@QueryParam("projectId")
projectId: String?,
@ApiParam("待更新代码库平台项目名", required = false)
projectNames: List<String>?
projectId: String?
): Result<Boolean>
}
19 changes: 19 additions & 0 deletions ...cess/api-process/src/main/kotlin/com/tencent/devops/process/api/user/UserBuildResource.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import com.tencent.devops.process.pojo.BuildHistoryRemark
import com.tencent.devops.process.pojo.BuildId
import com.tencent.devops.process.pojo.BuildManualStartupInfo
import com.tencent.devops.process.pojo.ReviewParam
import com.tencent.devops.process.pojo.pipeline.BuildRecordInfo
import com.tencent.devops.process.pojo.pipeline.ModelDetail
import com.tencent.devops.process.pojo.pipeline.ModelRecord
import io.swagger.annotations.Api
Expand Down Expand Up @@ -260,6 +261,24 @@ interface UserBuildResource {
executeCount: Int?
): Result<ModelRecord>

@ApiOperation("获取构建多次执行信息")
@GET
@Path("/projects/{projectId}/pipelines/{pipelineId}/builds/{buildId}/recordInfo")
fun getBuildRecordInfo(
@ApiParam(value = "用户ID", required = true, defaultValue = AUTH_HEADER_USER_ID_DEFAULT_VALUE)
@HeaderParam(AUTH_HEADER_USER_ID)
userId: String,
@ApiParam("项目ID", required = true)
@PathParam("projectId")
projectId: String,
@ApiParam("流水线ID", required = true)
@PathParam("pipelineId")
pipelineId: String,
@ApiParam("构建ID", required = true)
@PathParam("buildId")
buildId: String
): Result<List<BuildRecordInfo>>

@ApiOperation("获取构建详情")
@GET
// @Path("/projects/{projectId}/pipelines/{pipelineId}/buildNo/{buildNo}/detail")
Expand Down
5 changes: 4 additions & 1 deletion ...rocess/api-process/src/main/kotlin/com/tencent/devops/process/engine/pojo/PipelineInfo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
package com.tencent.devops.process.engine.pojo

import com.tencent.devops.common.pipeline.enums.ChannelCode
import com.tencent.devops.process.pojo.pipeline.TemplateInfo
import io.swagger.annotations.ApiModel
import io.swagger.annotations.ApiModelProperty

Expand Down Expand Up @@ -66,5 +67,7 @@ data class PipelineInfo(
@ApiModelProperty("ID")
val id: Long?,
@ApiModelProperty("流水线组名称列表", required = false)
var viewNames: List<String>? = null
var viewNames: List<String>? = null,
@ApiModelProperty("约束模式下的模板信息", required = false)
var templateInfo: TemplateInfo? = null
)
40 changes: 40 additions & 0 deletions ...s/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/BuildRecordInfo.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
*
* BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
*
* A copy of the MIT License is included in this file.
*
*
* Terms of the MIT License:
* ---------------------------------------------------
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of
* the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
* LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
* NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.process.pojo.pipeline

import com.tencent.devops.common.pipeline.pojo.time.BuildRecordTimeCost
import io.swagger.annotations.ApiModel
import io.swagger.annotations.ApiModelProperty

@ApiModel("执行次数记录")
data class BuildRecordInfo(
@ApiModelProperty("触发人", required = true)
val startUser: String,
@ApiModelProperty("耗时详情", required = true)
val timeCost: BuildRecordTimeCost?
)
7 changes: 6 additions & 1 deletion ...ocess/api-process/src/main/kotlin/com/tencent/devops/process/pojo/pipeline/ModelRecord.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,19 @@ data class ModelRecord(
val triggerReviewers: List<String>? = null,
@ApiModelProperty("当前查询的执行次数", required = false)
val executeCount: Int,
@Deprecated("信息已在recordList中存在")
@ApiModelProperty("历史重试执行人列表（有序）", required = true)
val startUserList: List<String>,
@ApiModelProperty("历史重试人列表（有序）", required = true)
val recordList: List<BuildRecordInfo>,
@ApiModelProperty("构建信息", required = false)
var buildMsg: String?,
@ApiModelProperty("原材料", required = false)
val material: List<PipelineBuildMaterial>?,
@ApiModelProperty("备注", required = false)
val remark: String?,
@ApiModelProperty("触发信息（包括代码库等）", required = false)
val webhookInfo: WebhookInfo?
val webhookInfo: WebhookInfo?,
@ApiModelProperty("约束模式下的模板信息", required = false)
var templateInfo: TemplateInfo? = null
)
Loading

0 comments on commit 5c47ad8

Please sign in to comment.