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.

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

【蓝盾-评审会已评审】【PAC】feat:流水线版本管理机制 #8161

Closed
fayewong-v5 opened this issue Dec 20, 2022 · 1 comment
Closed
Assignees
Labels
approved 产品特性审核通过 area/ci/backend CI 后端issue area/ci/frontend CI 前端特性issue done Production environment in tencent has been deploy for gray UAT environment in tencent has been deploy kind/feat/product 产品特性 service/process 流水线 todo todo
Milestone

Comments

@fayewong-v5
Copy link
Contributor

fayewong-v5 commented Dec 20, 2022

【背景】
PAC 场景下,流水线可能是在蓝盾进行修改,也可能是在代码库进行修改。不同修改途径下,需要理清版本状态变更脉络。

【需求】
1、版本生成路径如下:
image

2、有 3 种版本状态:

  • 草稿:一条流水线同一时间只有一个草稿
  • 分支:可能有一个或多个分支修改了 YAML 文件,且还未合并到「默认分支」
    • A 分支上多次提交代码时,对应的版本是同一个。当A上的修改合入「默认分支」后,再在A上的修改才重新生成一个版本
    • A 分支上的 YAML 文件落后于「默认分支」时,生成的分支版本增加警告,直至同步了「默认分支」上的变更后才去掉警告
  • 正式:当修改同步到「默认分支」上时,才生成对应的「正式版本」
    • 若由「普通分支」合并到 「默认分支」,对应的分支版本状态由 “分支版本” 扭转为 “正式版本”
    • 若由 「草稿」提交到「默认分支」,对应的草稿版本状态由“草稿”扭转为“正式版本”

3、当「分支版本」对应的分支被删除时,同步删除「分支版本」

  • 蓝盾DB软删除

4、当「默认分支」由 X 分支修改为 Y 分支时

  • 若已存在的分支版本为 Y 分支生成的,则扭转为「正式版本」
  • 存量的「正式版本」不发生变化
  • 在流水线的操作记录记一条变更:代码库「ggg」默认分支由「X」更新为「Y」,操作人 xxx

5、版本号规范:

  • 模式为 Vd(Px.Ty.z),如 V1(P1.T1.1)
  • P 代表 pipeline ,流水线编排。stage/job/task/variables 设置发生变化时,x 递增
  • T 代表 trigger,触发器。触发器发生变化时,y 递增
  • 当流水线其他信息变化时,z 递增
  • d 为当前正式版本的个数

注意:

  • 每个版本需记录基线版本
  • 分支版本记录来源分支
@EchoQT
Copy link
Collaborator

EchoQT commented Dec 28, 2022

ok

@EchoQT EchoQT assigned fayewong-v5 and unassigned EchoQT Dec 28, 2022
@EchoQT EchoQT added approved 产品特性审核通过 and removed for approve 产品特性申请审核 labels Dec 28, 2022
@fayewong-v5 fayewong-v5 modified the milestones: V1.10, V2.0 Feb 2, 2023
@royalhuang royalhuang self-assigned this May 8, 2023
royalhuang pushed a commit to royalhuang/bk-ci that referenced this issue Jun 26, 2023
royalhuang pushed a commit to royalhuang/bk-ci that referenced this issue Jun 26, 2023
royalhuang pushed a commit to royalhuang/bk-ci that referenced this issue Jun 26, 2023
royalhuang pushed a commit to royalhuang/bk-ci that referenced this issue Jun 26, 2023
royalhuang pushed a commit to royalhuang/bk-ci that referenced this issue Jun 26, 2023
royalhuang pushed a commit to royalhuang/bk-ci that referenced this issue Jun 26, 2023
@fayewong-v5 fayewong-v5 removed their assignment Jul 7, 2023
@fayewong-v5 fayewong-v5 added area/ci/frontend CI 前端特性issue area/ci/backend CI 后端issue todo todo labels Jul 7, 2023
@bkci-bot bkci-bot added for gray UAT environment in tencent has been deploy for test Test environment in tencent has been deploy and removed for gray UAT environment in tencent has been deploy todo todo labels Sep 9, 2024
mingshewhe added a commit that referenced this issue Sep 11, 2024
feat:流水线版本管理机制 #8161 优化互斥组互转
@bkci-bot bkci-bot added todo todo for gray UAT environment in tencent has been deploy and removed todo todo for test Test environment in tencent has been deploy for gray UAT environment in tencent has been deploy labels Sep 11, 2024
yongyiduan added a commit to yongyiduan/bk-ci that referenced this issue Sep 11, 2024
yongyiduan added a commit to yongyiduan/bk-ci that referenced this issue Sep 11, 2024
@bkci-bot bkci-bot added for gray UAT environment in tencent has been deploy todo todo for test Test environment in tencent has been deploy and removed todo todo for test Test environment in tencent has been deploy labels Sep 11, 2024
@bkci-bot bkci-bot removed the for gray UAT environment in tencent has been deploy label Oct 15, 2024
@bkci-bot bkci-bot added todo todo for test Test environment in tencent has been deploy and removed todo todo labels Nov 18, 2024
@bkci-bot bkci-bot added the todo todo label Nov 21, 2024
@yongyiduan yongyiduan added the tested 测试环境通过/test patest passed for test stage label Dec 12, 2024
bkci-bot added a commit that referenced this issue Dec 12, 2024
feat:流水线版本管理机制 #8161 setting表版本号解绑 优化
@yongyiduan yongyiduan added the service/process 流水线 label Dec 12, 2024
@bkci-bot bkci-bot added for gray UAT environment in tencent has been deploy and removed for test Test environment in tencent has been deploy tested 测试环境通过/test patest passed for test stage labels Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved 产品特性审核通过 area/ci/backend CI 后端issue area/ci/frontend CI 前端特性issue done Production environment in tencent has been deploy for gray UAT environment in tencent has been deploy kind/feat/product 产品特性 service/process 流水线 todo todo
Projects
Status: Done
Development

No branches or pull requests

8 participants