已合并
oam-tools切换CCE集群 #507
wangchuang616创建于 9 天前
oam-tools切换CCE集群 #507
已合并
wangchuang616创建于 9 天前
9 天前

描述

关联的Issue

测试

文档更新

类型标签

likedislike
Pull Request已成功合入, 合并人@CANN-robot
(感谢 wangchuang616 的贡献)
Wwangchuang616
9 天前 创建了 pull request,commit bd716229
atomgit-bot
atomgit-bot
9 天前 评论:

变更摘要

本次 PR 主要围绕 CI 流水线从原 dedicate-hosted 执行节点切换到 CCE 集群的 self-hosted 节点,并同步重构冒烟测试流程。改动集中在 .gitcode 下的多个 workflow 与 pre_smoke.sh:统一了各任务 runs-on 的标签写法,将 oam-tools_action.yml 的冒烟执行从“打包上传 + manifest-management-plugin 部署”改为在容器内直接执行 pre_smoke.sh,并简化了 pre_smoke.sh 的测试逻辑与日志上传逻辑。

主要改动

  • CI 执行节点统一切换为 self-hostedcodecheck_action.ymlcompile_action.ymlstaticcheck_action.ymlut_action.ymloam-tools_action.yml 中的 runs-on 均由 dedicate-hosted 系列标签改为 ['self-hosted', 'arch=...', 'spec=...'] 形式。
  • 冒烟执行流程重构oam-tools_action.yml 移除了 Checkout gitcode、业务代码打包上传、manifest-management-pluginDEPLOY/CRUSH 等步骤,改为在指定 container 镜像内直接执行 pre_smoke.sh,并仅将生成的 slog.tar.gz 上传至 OBS。
  • 冒烟运行环境调整:冒烟任务的 runs-on['self-hosted','arch=arm','smoke=204'] 改为 ['self-hosted','npu=1','smoke=204'],并新增了 PreSmoke_A900 容器镜像。
  • pre_smoke.sh 脚本简化:移除硬编码的 ops(如 is_finite)循环及 crop_and_resize 的 graph 模式分支,工作目录由固定的 /home/taskspace 改为使用 ${WORKSPACE} 环境变量,同时删除 plog 上传逻辑。
  • 环境变量动态化与新增后置任务oam-tools_action.ymlorg_namerepo_name 由硬编码改为从 vars.ORG_NAMEatomgit.event.repository.name 获取,并新增 post 阶段调用 post_action.yml
likedislike
atomgit-bot
atomgit-bot
9 天前 评论:

代码审查

✅ 未发现问题

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:cann-cla/yes
CANN-robot
CANN-robot成员
9 天前 评论:

Thanks for your pull-request.
The full list of commands accepted by me can be found at here
You can get sig-info at here
For more, you also can visit HICANN


PR Approval Progress

Congratulations! All modules have met the lgtm and approve requirements.

Module Approval Details

module lgtm status approve status
.gitcode/** 宋常霞, tanghaoran7 (2/2) 宋常霞 (1/1)

💡 Tip:

  • Committer can comment /approve or /lgtm
  • Commenting /approve implies both code review (lgtm) and intent to merge (approve)

CLA Signature Pass

wangchuang616, thanks for your pull request. All authors of the commits have signed the CLA. 👍

likedislike
CANN-robot
CANN-robot成员
9 天前 评论:

CLA Signature Pass

wangchuang616, thanks for your pull request. All authors of the commits have signed the CLA. 👍

likedislike
CANN-robotCANN-robot成员
9 天前 将mywaaagh_admin,songchangxia,newstarzj,tanghaoran7,chenhao_1209,shentukangjun,wulinyu,zhuliangying,yaoguangxiu,fujun19,Larry_liuyi,jinyingqi,yuanjiang_设为评审人
CANN-robotCANN-robot成员
9 天前 将mywaaagh_admin,songchangxia,tanghaoran7,shentukangjun,Larry_liuyi设为审查人
wangchuang616
9 天前 评论:

compile

likedislike
Wwangchuang616
9 天前 update merge request[project id: 8784133, iid: 507, commit_id: f2228019647f307d9d28415b806036c3b36d9e81] virtual merging success
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-running
CANN-robot
CANN-robot成员
9 天前 评论:

流水线任务触发成功
任务链接 [0e099e1bd7264cd297c58cd897b39c14][流水线指导]

任务名称状态日志下载链接
codecheck ✅ SUCCESS >>>>>
SCA ✅ SUCCESS >>>>>
antipoison ✅ SUCCESS >>>>>
Check_Pr ✅ SUCCESS >>>>>
Compile_Ascend_X86 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_ubuntu24 ✅ SUCCESS >>>>> >>>>>
pre_comment ✅ SUCCESS >>>>>
cocheck_codestyle ✅ SUCCESS
precommit ❌ FAILED >>>>> >>>>>
StaticCheck_codespell ✅ SUCCESS
StaticCheck_link_validity ✅ SUCCESS
StaticCheck_resource_existence ✅ SUCCESS
StaticCheck_tag_closed ✅ SUCCESS
StaticCheck_markdownlint ✅ SUCCESS
likedislike
CANN-robotCANN-robot成员
9 天前 删除了label:ci-pipeline-running
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-failed
CANN-robot
CANN-robot成员
9 天前 评论:
流水线 PR-pipeline_cann_oam-tools#1692 [ commitID:4fb67dba ] 运行失败
likedislike
Wwangchuang616
9 天前 update merge request[project id: 8784133, iid: 507, commit_id: e0cf47fd6c331247680e26978a704db22c0e89c9] virtual merging success
Wwangchuang616
9 天前 强制推送  1 个提交:1e8f3403-切换CCE集群
Wwangchuang616
9 天前 update merge request[project id: 8784133, iid: 507, commit_id: bb46c3733e4882c7a3d354a98f654e72f1c7ddaf] virtual merging success
CANN-robotCANN-robot成员
9 天前 删除了label:cann-cla/yes
CANN-robotCANN-robot成员
9 天前 添加了label:cann-cla/yes
wangchuang616
9 天前 评论:

compile

likedislike
Wwangchuang616
9 天前 update merge request[project id: 8784133, iid: 507, commit_id: ba1039de13a2e6d05102f0dc3098e1408f5e7558] virtual merging success
CANN-robotCANN-robot成员
9 天前 删除了label:ci-pipeline-failed
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-running
CANN-robot
CANN-robot成员
9 天前 评论:

流水线任务触发成功
任务链接 [2d6cefef0c614f698091d2a983300026][流水线指导]

任务名称状态日志下载链接
codecheck ✅ SUCCESS >>>>>
SCA ✅ SUCCESS >>>>>
antipoison ✅ SUCCESS >>>>>
Check_Pr ✅ SUCCESS >>>>>
Compile_Ascend_X86 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_ubuntu24 ✅ SUCCESS >>>>> >>>>>
pre_comment ✅ SUCCESS >>>>>
cocheck_codestyle ✅ SUCCESS
precommit ✅ SUCCESS >>>>>
StaticCheck_codespell ✅ SUCCESS
StaticCheck_link_validity ✅ SUCCESS
StaticCheck_resource_existence ✅ SUCCESS
StaticCheck_tag_closed ✅ SUCCESS
StaticCheck_markdownlint ✅ SUCCESS
UT_Test_asys ✅ SUCCESS >>>>>
UT_Test_msaicerr ✅ SUCCESS >>>>>
UT_Test_msprof ✅ SUCCESS >>>>>
API_Check ✅ SUCCESS >>>>>
PreSmoke_A900 ✅ SUCCESS >>>>>

[2026-08-14 17:44:57]    CI执行结束

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:api-check-pass
CANN-robotCANN-robot成员
9 天前 删除了label:ci-pipeline-running
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-passed
CANN-robot
CANN-robot成员
9 天前 评论:
流水线 PR-pipeline_cann_oam-tools#1694 [ commitID:1e8f3403 ] 已完成
likedislike
songchangxia成员
9 天前 评论:

/approve
/lgtm

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:approved
tanghaoran
tanghaoran成员
9 天前 评论:

/lgtm

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:lgtm
CANN-robotCANN-robot成员
9 天前 合入了pull request