feat:【流水线插件】支持历史大版本下的小版本更新 TencentBlueKing#1841

carlyin0801 · Sep 8, 2021 · e1aad31 · e1aad31
1 parent f7447ad
commit e1aad31
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...store-image/src/main/kotlin/com/tencent/devops/store/service/image/ImageReleaseService.kt b/...store-image/src/main/kotlin/com/tencent/devops/store/service/image/ImageReleaseService.kt
@@ -406,12 +406,18 @@ abstract class ImageReleaseService {
                 (cancelFlag && releaseType == ReleaseTypeEnum.CANCEL_RE_RELEASE)) {
                 // 首次创建版本或者取消发布后不变更版本号重新上架，则在该版本的记录上做更新操作
                 imageId = imageRecord.id
+                val finalReleaseType = if (releaseType == ReleaseTypeEnum.CANCEL_RE_RELEASE) {
+                    val imageVersion = marketImageVersionLogDao.getImageVersion(context, imageId)
+                    imageVersion.releaseType
+                } else {
+                    releaseType.releaseType.toByte()
+                }
                 updateMarketImage(
                     context = context,
                     userId = userId,
                     imageId = imageId,
                     imageSize = "",
-                    releaseType = releaseType.releaseType.toByte(),
+                    releaseType = finalReleaseType,
                     marketImageUpdateRequest = marketImageUpdateRequest
                 )
             } else {