Skip to content

Commit

Permalink
feat: 矩阵输出上下文支持数组访问 TencentBlueKing#5964 增加矩阵内stepId声明
Browse files Browse the repository at this point in the history
  • Loading branch information
royalhuang committed Jan 18, 2022
1 parent aa3d661 commit db99ad0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 162 deletions.
2 changes: 1 addition & 1 deletion ...main/kotlin/com/tencent/devops/common/pipeline/pojo/element/matrix/MatrixStatusElement.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ data class MatrixStatusElement(
@ApiModelProperty("启动时间", required = false)
override var startEpoch: Long? = null,
@ApiModelProperty("上下文标识", required = false)
override var stepId: String? = null,
override var stepId: String?,
@ApiModelProperty("原插件的类型标识")
var originClassType: String,
// 当状态插件为质量红线插件是需要专门保存
Expand Down
161 changes: 0 additions & 161 deletions ...n-pipeline/src/test/kotlin/com/tencent/devops/common/pipeline/pojo/StagePauseCheckTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,165 +45,4 @@ internal class StagePauseCheckTest {
originKeys
)
}

@Test
@Suppress("ALL")
fun genMatrixContainer() {
val vmContainer = VMBuildContainer(
id = "1",
name = "构建矩阵demo",
elements = listOf(
MarketBuildAtomElement(
name = "有编译环境市场插件",
atomCode = "checkout",
version = "1.*",
data = mapOf()
),
LinuxScriptElement(
name = "内置脚本插件",
scriptType = BuildScriptType.SHELL,
script = "echo \${{ matrix.var1 }} \n echo \${{ matrix.var2 }}",
continueNoneZero = false
)
),
baseOS = VMBaseOS.ALL,
status = BuildStatus.SUCCEED.name,
startEpoch = 1551807007986,
executeCount = 1,
jobId = "myMatrix1",
canRetry = true,
containerId = "1",
containerHashId = "c-9de5cd612def4e7caa448ee116fa8560",
matrixGroupFlag = true,
matrixControlOption = MatrixControlOption(
strategyStr = """
os: [docker,macos]
var1: [a,b,c]
var2: [1,2,3]
""",
includeCaseStr = YamlUtil.toYaml(listOf(mapOf("var1" to "a"), mapOf("var2" to "2"))),
excludeCaseStr = YamlUtil.toYaml(listOf(mapOf("var2" to "1"))),
totalCount = 10, // 3*3 + 2 - 1
finishCount = 1,
fastKill = true,
maxConcurrency = 50
),
groupContainers = mutableListOf(
VMBuildContainer(
id = "10001",
name = "构建矩阵demo",
elements = listOf(
MatrixStatusElement(
name = "有编译环境市场插件",
id = "e-8104cd612def4e7caa448ee116fa8560",
status = BuildStatus.SUCCEED.name,
executeCount = 1,
elapsed = 123,
originClassType = ""
),
MatrixStatusElement(
name = "内置脚本插件",
id = "e-1536cd612def4e7caa448ee116fa8560",
status = BuildStatus.SUCCEED.name,
executeCount = 1,
elapsed = 321,
originClassType = ""
)
),
status = BuildStatus.SUCCEED.name,
startEpoch = 1551807007986,
executeCount = 1,
canRetry = true,
containerId = "10001",
containerHashId = "c-9de5cd612def4e7caa448ee116fa8560",
matrixGroupFlag = true,
buildEnv = mapOf("variables.var1" to "aaa", "variables.var2" to "bbb"),
customBuildEnv = mapOf("e1" to "123", "e2" to "321"),
mutexGroup = null,
baseOS = VMBaseOS.ALL,
matrixGroupId = "c-9de5cd612def4e7caa448ee116fa8560"
)
),
buildEnv = mapOf("variables.var1" to "aaa", "variables.var2" to "bbb"),
customBuildEnv = mapOf("e1" to "123", "e2" to "321"),
mutexGroup = null
)
val normalContainer = NormalContainer(
id = "2",
name = "构建矩阵demo",
elements = listOf(
MarketBuildLessAtomElement(
name = "无有编译环境市场插件",
atomCode = "JobScriptExecutionA",
version = "1.*",
data = mapOf()
)
),
status = BuildStatus.SUCCEED.name,
startEpoch = 1551807007986,
executeCount = 1,
jobId = "myMatrix2",
canRetry = true,
containerId = "2",
containerHashId = "c-4512cd612def4e7caa448ee116fa8560",
mutexGroup = null,
matrixGroupFlag = true,
matrixControlOption = MatrixControlOption(
strategyStr = """
m1: [a,b,c]
m2: [1,2,3]
""",
includeCaseStr = YamlUtil.toYaml(listOf(mapOf("m3" to "1"), mapOf("m3" to "2"))),
excludeCaseStr = YamlUtil.toYaml(listOf(mapOf("m2" to "1"))),
totalCount = 10, // 3*3 + 2 - 1
finishCount = 1,
fastKill = true,
maxConcurrency = 50
),
groupContainers = mutableListOf(
NormalContainer(
id = "20001",
name = "构建矩阵demo",
elements = listOf(
MatrixStatusElement(
name = "无有编译环境市场插件",
id = "e-2314cd612def4e7caa448ee116fa8560",
status = BuildStatus.SUCCEED.name,
executeCount = 1,
elapsed = 234,
originClassType = ""
)
),
status = BuildStatus.SUCCEED.name,
startEpoch = 1551807007986,
executeCount = 1,
jobId = "myMatrix2",
canRetry = true,
containerId = "20001",
containerHashId = "c-3124cd612def4e7caa448ee116fa8560",
matrixGroupFlag = true,
mutexGroup = null,
matrixGroupId = "c-4512cd612def4e7caa448ee116fa8560"
)
)
)
val triggerContainer = TriggerContainer(
id = "0",
name = "触发构建",
elements = listOf(ManualTriggerElement(name = "手动触发"))
)

val model = Model(
name = "构建矩阵样例",
desc = null,
stages = listOf(
Stage(id = "stage-1", name = "stage-1", containers = listOf(triggerContainer)),
Stage(id = "stage-2", name = "stage-2", containers = listOf(vmContainer, normalContainer))
)
)
println(model.getStage("stage-2")?.getContainer("1")?.getContainerById("10001"))
println(model.getContainer("10001"))
println(model.getContainer("20001"))
println(JsonUtil.toJson(model))
}
}
1 change: 1 addition & 0 deletions ...ent/devops/process/engine/control/command/container/impl/InitializeMatrixGroupStageCmd.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ class InitializeMatrixGroupStageCmd(
MatrixStatusElement(
name = e.name,
id = e.id,
stepId = e.stepId,
executeCount = executeCount,
originClassType = e.getClassType(),
interceptTask = interceptTask,
Expand Down

0 comments on commit db99ad0

Please sign in to comment.