From 8f39b80d0de75a6acad4485254139b91f1978510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yongyiduan=28=E6=AE=B5=E6=B0=B8=E5=84=84=29?= Date: Mon, 9 Sep 2024 19:33:09 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E6=9C=BA=E5=88=B6=20#8161?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E4=BA=92=E6=96=A5=E7=BB=84=E4=BA=92?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tencent/devops/process/yaml/transfer/ContainerTransfer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt index b99fb572a33..91afd4e7e5d 100644 --- a/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt +++ b/src/backend/ci/core/common/common-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt @@ -415,11 +415,11 @@ class ContainerTransfer @Autowired(required = false) constructor( } private fun getMutexYaml(resource: MutexGroup?): Mutex? { - if (resource?.mutexGroupName.isNullOrBlank()) { + if (resource?.mutexGroupName.isNullOrBlank() || resource?.enable != true) { return null } return Mutex( - label = resource?.mutexGroupName!!, + label = resource.mutexGroupName!!, queueLength = if (resource.queueEnable) { resource.queue } else {