- Infra - mailweb.openeuler.org

【Meeting Notice】openEuler基础设施周例会 Time: 2020-07-21 17:00-18:00
by Meeting Book 21 Jul '20

21 Jul '20

2 1

21 Jul '20

技术委员会：大家好！我们希望创建一个新的SIG：sig-Goalkeeper，主要用于支撑、改进openEuler社区日常CI任务，看护社区门禁，包括社区机器人（辅助代码合入）、Jenkins门禁任务、OBS包构建任务等。为了广大社区参与者在贡献过程中有更好的工作体验，社区运作有更流畅的自动化流程，我们sig-Goalkeeper 将持续改进社区CI任务流程，为开发者提供一个CI问题集中反馈与解决的场所。通过本SIG的持续发展，实现openEuler社区高度流程化、自动化，社区开发体验人性化。   CI-Job SIG业务范畴： 1、 openEuler社区CI机器人服务的维护与改进，主要负责任务、PR辅助处理。 2、 openEuler社区Jenkins门禁服务的维护与改进，重点关注任务运行流畅度、用户交互可服务性等方面的提升。 3、 openEuler社区OBS包构建服务的维护与改进，重点关注OBS任务运行的基础平台可靠性和运行效率。计划创建仓库：https://gitee.com/openeuler/goalkeeper SIG一期成员：胡峰/董剑/邓鹏/缪开波/胡胜/周昂/刘奇/曹志谢谢曹志

1 0

[Patch] Add-author-signer-reviewer-in-Merge-description
by caihaomin 14 Jul '20

14 Jul '20

Hi Infra members~ As discussed in issue https://gitee.com/openeuler/community/issues/I1NQ50 I am trying to complete this feature. The problem is that I only can write some unit test to confirm the output right as showed below [cid:image001.png@01D65A20.448098A0] I can not set up the ci-bot locally so I can't fully test the feature. Can anyone give me a hand~ and review the patch ^_^ From 238cf5466ce8ecefbe4a2ca369b3dce9ac885f3c Mon Sep 17 00:00:00 2001 From: c00416947 <caihaomin(a)huawei.com> Date: Tue, 14 Jul 2020 20:12:50 +0800 Subject: [PATCH] Add author/signer/reviewer in Merge description Signed-off-by: Haomin <caihaomin(a)huawei.com> --- pkg/cibot/oauth.go | 2 +- pkg/cibot/pullrequest.go | 77 +++++++++++++++++++++++++++++++++++ pkg/cibot/pullrequest_test.go | 35 ++++++++++++++++ 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 pkg/cibot/pullrequest_test.go diff --git a/pkg/cibot/oauth.go b/pkg/cibot/oauth.go index 79fac4b..d6e9983 100644 --- a/pkg/cibot/oauth.go +++ b/pkg/cibot/oauth.go @@ -30,7 +30,7 @@ func GetToken(code string) (*oauth2.Token, error) { ctx := context.Background() config := Setup(client, redirect, secret) - glog.Infof("Token request config : %v, code:", config, code) + glog.Infof("Token request config : %v, code: %s", config, code) return config.Exchange(ctx, code) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index bf3c738..0cea8e2 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -408,6 +408,15 @@ func (s *Server) MergePullRequest(event *gitee.NoteEvent) error { // merge pr body := gitee.PullRequestMergePutParam{} body.AccessToken = s.Config.GiteeToken + + // generate merge body + description, err := s.generateMergeDescription(event) + if err != nil { + glog.Errorf("unable to get merge description. err: %v", err) + return err + } + + body.Description = description _, err = s.GiteeClient.PullRequestsApi.PutV5ReposOwnerRepoPullsNumberMerge(s.Context, owner, repo, prNumber, body) if err != nil { glog.Errorf("unable to merge pull request. err: %v", err) @@ -418,3 +427,71 @@ func (s *Server) MergePullRequest(event *gitee.NoteEvent) error { return nil } + +func (s *Server) generateMergeDescription(event *gitee.NoteEvent) (string, error) { + // get basic params + owner := event.Repository.Namespace + repo := event.Repository.Name + prNumber := event.PullRequest.Number + commentCount := event.PullRequest.Comments + var perPage int32 = 20 + pageCount := commentCount / perPage + if commentCount%perPage > 0 { + pageCount++ + } + + result := "" + localVarOptionals := &gitee.GetV5ReposOwnerRepoPullsNumberCommentsOpts{} + localVarOptionals.AccessToken = optional.NewString(s.Config.GiteeToken) + localVarOptionals.PerPage = optional.NewInt32(perPage) + + var signers = make([]string,0) + var reviewers = make([]string,0) + // range page and get comments + for page := pageCount; page > 0; page-- { + localVarOptionals.Page = optional.NewInt32(page) + comments,_, err := s.GiteeClient.PullRequestsApi.GetV5ReposOwnerRepoPullsNumberComments(s.Context,owner,repo,prNumber,localVarOptionals) + if err != nil { + glog.Errorf("unable to get pull request comments. err: %v", err) + return result, err + } + + signers, reviewers, err = getSignersAndReviewers(comments) + if err != nil { + glog.Errorf("failed to get signers or reviewers. err: %v", err) + } + } + + result = formatDescription(event.PullRequest.User.Login, reviewers, signers) + return result, nil +} + +func formatDescription(user string, reviewers,signers []string) string { + return fmt.Sprintf("From: @%s\nReviewed-by: %s\nSigned-off-by: %s\n", + user, strings.Join(reviewers,","), strings.Join(signers,",")) +} + +func getSignersAndReviewers(comments []gitee.PullRequestComments)([]string, []string ,error) { + var signers = make([]string,0) + var reviewers = make([]string,0) + + if len(comments)== 0 { + return signers,reviewers, fmt.Errorf("comment list is empty") + } + + for _, comment := range comments { + m := RegAddLgtm.FindStringSubmatch(comment.Body) + if m != nil && comment.UpdatedAt == comment.CreatedAt { + reviewer := fmt.Sprintf("@%s", comment.User.Login) + reviewers = append(reviewers,reviewer) + } + + m = RegAddApprove.FindStringSubmatch(comment.Body) + if m != nil && comment.UpdatedAt == comment.CreatedAt { + signer := fmt.Sprintf("@%s", comment.User.Login) + signers = append(signers,signer) + } + } + + return signers,reviewers,nil +} diff --git a/pkg/cibot/pullrequest_test.go b/pkg/cibot/pullrequest_test.go new file mode 100644 index 0000000..aa4ea28 --- /dev/null +++ b/pkg/cibot/pullrequest_test.go @@ -0,0 +1,35 @@ +package cibot + +import ( + "testing" +) + +func Test_formatDescription(t *testing.T) { + type args struct { + user string + reviewers []string + signers []string + } + tests := []struct { + name string + args args + want string + }{ + { + name: "test description format", + args: args{ + user: "fakeuser", + reviewers: []string{"@aaa", "@bbb"}, + signers: []string{"@ccc", "@ddd"}, + }, + want: "From: @fakeuser\nReviewed-by: @aaa,@bbb\nSigned-off-by: @ccc,@ddd\n", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := formatDescription(tt.args.user, tt.args.reviewers, tt.args.signers); got != tt.want { + t.Errorf("formatDescription() = %v, want %v", got, tt.want) + } + }) + } +} -- 2.19.1

1 0

step down the maintainer of openEuler infrastructure team.
by Edward Lee 14 Jul '20

14 Jul '20

hi, infrastructure team members and all contributors: Firstly, I would like to take the time to thank you all for allowing me to have chance to work in infrastructure core team, and I have enjoyed it during this time. also much thanks those who have made much efforts on this domain of this community. Unfortunately, it has come to the time slot where my major work divide my attention much, I am no longer able to devote the time needed as a maintainer later. so I would step down the maintainer of infrastructure team, I will still to be committer of this team if you all agree. I would suggest anyone of the core team members who will to lead this group to nominate yourself by this email channel and we'll vote it if there are more than one on the next weekly meeting. if there is no nomination, please allow me to nominatie one on the mail list. I will still be there until a proper one is found. Thank you all again. ----freesky-edward

4 5

【Meeting Notice】openEuler基础设施周例会 Time: 2020-07-14 17:00-18:00
by Meeting Book 14 Jul '20

14 Jul '20

1 0

回复：step down the maintainer of openEuler infrastructure team.
by xiangxinyong 13 Jul '20

13 Jul '20

Thanks @Edward Lee. You have done a great work in the Sig Infra in openEuler Community. Hope you have a great future life. Anywhere, Anytime, you are welcome to back to openEuler Community. Best Regards, Edison Xiang ------------------ 原始邮件 ------------------ 发件人: "Edward Lee" <freesky.edward(a)gmail.com>; 发送时间: 2020年7月13日(星期一) 下午3:11 收件人: "infra"<infra(a)openeuler.org>; 主题: [Infra] step down the maintainer of openEuler infrastructure team. hi, infrastructure team members and all contributors: Firstly, I would like to take the time to thank you all for allowing me to have chance to work in infrastructure core team, and I have enjoyed it during this time. also much thanks those who have made much efforts on this domain of this community. Unfortunately, it has come to the time slot where my major work divide my attention much, I am no longer able to devote the time needed as a maintainer later. so I would step down the maintainer of infrastructure team, I will still to be committer of this team if you all agree. I would suggest anyone of the core team members who will to lead this group to nominate yourself by this email channel and we'll vote it if there are more than one on the next weekly meeting. if there is no nomination, please allow me to nominatie one on the mail list. I will still be there until a proper one is found. Thank you all again. ----freesky-edward

2 1

回复：raspberrypi 仓库添加协作者
by George 09 Jul '20

09 Jul '20

Hi, yafen：我们和码云确认了下，码云的限制是这样的： 1.如果是个人仓库，待指定的issue负责人或者协作者需要是仓库成员。 2.如果是企业仓库，待指定的issue负责人或者协作者需要是企业成员。您看，如果您将学生添加为个人fork仓库的仓库成员，在个人仓库提交issue，并将该issue 协作者指定为学生，能否完成相关述求呢；当然，如果您认为确实有必要将学生指定为企业仓库 issue 协作者，我们也可以进一步讨论下，^-^ ------------------ 原始邮件 ------------------ 发件人: "方亚芬"<yafen(a)iscas.ac.cn>; 发送时间: 2020年7月7日(星期二) 下午5:04 收件人: "infra"<infra(a)openeuler.org>; 主题: [Infra] raspberrypi 仓库添加协作者 openEuler基础设施团队的老师，您好。我是 openEuler 社区 RaspberryPi SIG 的 maintainer。我们参加了暑期 2020 项目，需要将参与的学生设置为仓库 raspberrypi 某个 issue 的协作者。我直接给对应 issue 设置负责者，但是搜不到对应学生的 ID，所以无法设置。想问下老师，是不是需要您帮忙设置？谢谢。祝工作顺利，生活愉快。 ------------------------------------------ 方亚芬中国科学院软件研究所  智能软件研究中心邮箱：yafen(a)iscas.ac.cn 地址：北京市海淀区中关村南四街4号5楼

1 0

raspberrypi 仓库添加协作者
by 方亚芬 07 Jul '20

07 Jul '20

openEuler基础设施团队的老师，您好。我是 openEuler 社区 RaspberryPi SIG 的 maintainer。我们参加了暑期 2020 项目，需要将参与的学生设置为仓库 raspberrypi 某个 issue 的协作者。我直接给对应 issue 设置负责者，但是搜不到对应学生的 ID，所以无法设置。想问下老师，是不是需要您帮忙设置？谢谢。祝工作顺利，生活愉快。 ------------------------------------------ 方亚芬中国科学院软件研究所智能软件研究中心邮箱：yafen(a)iscas.ac.cn 地址：北京市海淀区中关村南四街4号5楼

1 0

【Meeting Notice】openEuler基础设施周例会 Time: 2020-07-07 17:00-18:00
by Meeting Book 07 Jul '20

07 Jul '20

1 0

【Meeting Notice】openEuler基础设施周例会 Time: 2020-06-30 17:00-18:00
by Meeting Book 30 Jun '20

30 Jun '20

1 0