{log_data} + {remind_str} """.format(brh=branch, pkg=pkg_name, command=command, - _type=failed_type, log_data=log_data) + _type=failed_type, log_data=log_data, remind_str=remind_str) issue_id = self.create_issue(params) return issue_id @@ -900,7 +902,7 @@ class IssueOperation(Operation): if epol_list: repo_dict = dict() repo_dict["repo_type"] = "epol" - if "sp2" in branch or "SP2" in branch: + if any(mul_branch in branch for mul_branch in MULTI_VERSION_BRANCHS): repo_dict["url"] = base_url + "/EPOL/update_" + release_date + "/main/" else: repo_dict["url"] = base_url + "/EPOL/update_" + release_date + "/" diff --git a/release-assistant/javcra/application/serialize/serialize.py b/release-assistant/javcra/application/serialize/serialize.py index 51c1c737bff922b36e46c64b59e7d42dc0b45558..15e19cdb67df165e32523ec682c53e9c3aaa64d1 100644 --- a/release-assistant/javcra/application/serialize/serialize.py +++ b/release-assistant/javcra/application/serialize/serialize.py @@ -17,6 +17,8 @@ from marshmallow import Schema from marshmallow import fields from marshmallow import validate +from javcra.common.constant import CHECK_PART_LIST + class BaseSchema(Schema): """ @@ -42,7 +44,7 @@ class CheckSchema(BaseSchema): check command parameter verification """ type = fields.String( - required=True, validate=validate.OneOf(["status", "requires", "test"]) + required=True, validate=validate.OneOf(CHECK_PART_LIST) ) ak = fields.String(required=False, validate=validate.Length(min=1)) sk = fields.String(required=False, validate=validate.Length(min=1)) diff --git a/release-assistant/javcra/cli/commands/checkpart.py b/release-assistant/javcra/cli/commands/checkpart.py index 5ae22157944b99f81128880e03bf10a818fabd08..24745fa833a39575e2355667dfe73c9f76ad17e3 100644 --- a/release-assistant/javcra/cli/commands/checkpart.py +++ b/release-assistant/javcra/cli/commands/checkpart.py @@ -30,7 +30,12 @@ from javcra.common.constant import ( MAX_PARAL_NUM, REALSE_TOOLS_BUCKET_NAME, REALSE_TOOLS_SERVER, - X86_FRAME, CHECK_COMMENT_DICT, EPOL_DICT) + X86_FRAME, + CHECK_COMMENT_DICT, + EPOL_DICT, + COMMENT_DICT, + LABEL_DICT, + CHECK_PART_LIST) from javcra.api.obscloud import ObsCloud from javcra.libs.log import logger @@ -54,7 +59,7 @@ class CheckCommand(BaseCommand): action="store", nargs=None, required=True, - choices=["status", "requires", "test"], + choices=CHECK_PART_LIST, ) self.sub_parse.add_argument( "--ak", @@ -146,6 +151,51 @@ class CheckCommand(BaseCommand): check_issue = CheckEntrance(GITEE_REPO, params.token, params.releaseIssueID) return check_issue + def judge_cve_bugfix_comment(self, issue, params): + """ + Description: judge whether /bugfix-ok and /cve-ok in comment area + Args: + issue: issue object + params: Command line parameters + + Returns: + True or False + """ + comment_params = {"owner": "openEuler", "repo": GITEE_REPO, "issue_id": params.releaseIssueID} + comment_list = [COMMENT_DICT.get("cve"), COMMENT_DICT.get("bugfix")] + judge_res = issue.judge_specific_comment_exists(comment_list, comment_params) + if not judge_res: + print("[ERROR] cve list or bugfix list not OK, please check.") + return False + return True + + def create_specific_label(self, issue_object, params, label_part): + """ + Description: create specific issue label + Args: + issue_object: issue object + params: Command line parameters + label_part: create label like release label or requires label + """ + label_params = {"owner": "openEuler", "repo": GITEE_REPO, "issue_id": params.releaseIssueID} + create_res = issue_object.create_issue_label([LABEL_DICT.get("requires")], label_params) + if not create_res: + raise ValueError("failed to create %s label for release issue." % label_part) + + def cve_bugfix_operation(self, params): + """ + Description: the operation for cve and bugfix list check + Args: + params: Command line parameters + """ + issue = self.issue(params) + judege_res = self.judge_cve_bugfix_comment(issue, params) + if not judege_res: + return + + self.create_specific_label(issue, params, "requires") + print("[INFO] successfuly operate cve and bugfix in check part.") + def test_operation(self, params): """ Description: the operation for test @@ -159,6 +209,9 @@ class CheckCommand(BaseCommand): if not review_res: print("[ERROR] failed to operate test in check part.") return False + + issue = self.issue(params) + self.create_specific_label(issue, params, "release") print("[INFO] successfully operate test in check part.") return True @@ -332,6 +385,10 @@ class CheckCommand(BaseCommand): print("failed to write back to install_build issue %s in release issue" % issue_id) issue = self.issue(params) + judege_res = self.judge_cve_bugfix_comment(issue, params) + if not judege_res: + return + check_issue = self.check_issue(params) branch_name, update_pkgs, release_date = self.get_release_info(issue) @@ -412,6 +469,7 @@ class CheckCommand(BaseCommand): """ comment = CHECK_COMMENT_DICT.get(params.type) + if not comment: print("[ERROR] not allowed operation, please check.") return diff --git a/release-assistant/javcra/cli/commands/releasepart.py b/release-assistant/javcra/cli/commands/releasepart.py index e87c14658e6cdfbfcac9a5ea8ba21dfc71825a19..a14cd3e94fbba77b3c9d59fb9bf010afb8467f92 100644 --- a/release-assistant/javcra/cli/commands/releasepart.py +++ b/release-assistant/javcra/cli/commands/releasepart.py @@ -21,7 +21,7 @@ from javcra.application.serialize.serialize import ReleaseSchema from javcra.cli.base import BaseCommand from javcra.cli.commands import parameter_permission_validate from javcra.common import constant -from javcra.common.constant import MAX_PARAL_NUM, GITEE_REPO, EPOL_DICT +from javcra.common.constant import MAX_PARAL_NUM, GITEE_REPO, EPOL_DICT, COMMENT_DICT class ReleaseCommand(BaseCommand): @@ -72,6 +72,24 @@ class ReleaseCommand(BaseCommand): required=True, ) + def judge_test_comment(self, issue, params): + """ + Description: judge whether /test-ok in comment area + Args: + issue: issue object + params: Command line parameters + + Returns: + True or False + """ + comment_params = {"owner": "openEuler", "repo": GITEE_REPO, "issue_id": params.releaseIssueID} + comment_list = [COMMENT_DICT.get("test")] + judge_res = issue.judge_specific_comment_exists(comment_list, comment_params) + if not judge_res: + print("[ERROR] test not OK, please check.") + return False + return True + def checkok_operation(self, params): """ Description: operation for check ok @@ -119,6 +137,11 @@ class ReleaseCommand(BaseCommand): self.create_comment("{action} epol rpm jenkins res".format(action=action), epol_transfer_res, issue) issue = IssueOperation(GITEE_REPO, params.token, params.releaseIssueID) + + judege_res = self.judge_test_comment(issue, params) + if not judege_res: + return + branch_name, update_pkgs, release_date = self.get_release_info(issue) # get parallel jenkins job num according to length of pkg_list and max parallel num @@ -153,6 +176,10 @@ class ReleaseCommand(BaseCommand): Returns: """ + issue = IssueOperation(GITEE_REPO, params.token, params.releaseIssueID) + judege_res = self.judge_test_comment(issue, params) + if not judege_res: + return release_resp = IssueOperation.release_announcement(params.publishuser, params.publishkey) if not release_resp: diff --git a/release-assistant/javcra/cli/commands/startpart.py b/release-assistant/javcra/cli/commands/startpart.py index f0519d827a69245caf4d15e4aecdc5e18f2153c8..9854bb3427e5437871a19f3e467aac9a22b6fe6d 100644 --- a/release-assistant/javcra/cli/commands/startpart.py +++ b/release-assistant/javcra/cli/commands/startpart.py @@ -19,7 +19,7 @@ from javcra.application.modifypart.modifyentrance import IssueOperation from javcra.application.serialize.serialize import StartSchema from javcra.cli.base import BaseCommand from javcra.cli.commands import parameter_permission_validate -from javcra.common.constant import GITEE_REPO +from javcra.common.constant import GITEE_REPO, LABEL_DICT class StartCommand(BaseCommand): @@ -79,3 +79,9 @@ class StartCommand(BaseCommand): print("[INFO] start update successfully.") else: print("[ERROR] failed to start update.") + return + + label_params = {"owner": "openEuler", "repo": GITEE_REPO, "issue_id": params.releaseIssueID} + create_res = issue.create_issue_label([LABEL_DICT.get("start")], label_params) + if not create_res: + print("failed to create start label for release issue.") diff --git a/release-assistant/javcra/common/constant.py b/release-assistant/javcra/common/constant.py index ecef20f2b2abc23c48037fce7ceaf22d5f20d543..db0544e7feb74e67e3227e02078cf000fe7493b2 100644 --- a/release-assistant/javcra/common/constant.py +++ b/release-assistant/javcra/common/constant.py @@ -39,6 +39,7 @@ PERMISSION_INFO = { "/check-ok", "/cvrf-ok", "/start-update" + "/check-cve-bugfix" ], "developer": [ "/add-bugfix", @@ -46,6 +47,7 @@ PERMISSION_INFO = { "/bugfix-ok", "/check-status", "/get-requires", + "/check-cve-bugfix" ], "tester": ["/test-ok"], "tc": ["/check-ok"], @@ -71,7 +73,7 @@ AARCH_FRAME = "aarch64" X86_FRAME = "x86_64" # branch list for standard epol list -BRANCH_LIST = ["openEuler-20.03-LTS-SP1", "openEuler-20.03-LTS-SP2", "openEuler-20.03-LTS"] +BRANCH_LIST = ["openEuler-20.03-LTS-SP1", "openEuler-20.03-LTS-SP2", "openEuler-20.03-LTS-SP3", "openEuler-20.03-LTS"] # lts branch LTS_BRANCH = "openEuler-20.03-LTS" @@ -100,6 +102,7 @@ TRIGGER_TM_JOB = "function-item/release-manager/update_template_jobs/trigger" ACTUATOR_DICT = { "openEuler-20.03-LTS-SP1": "openeuler-20.03-lts-sp1", "openEuler-20.03-LTS-SP2": "openeuler-20.03-lts-sp2", + "openEuler-20.03-LTS-SP3": "openeuler-20.03-lts-sp3", "openEuler-20.03-LTS": "openeuler-20.03-lts" } @@ -136,6 +139,7 @@ CHECK_COMMENT_DICT = { "status": "/check-status", "requires": "/get-requires", "test": "/test-ok", + "cve_bugfix": "/check-cve-bugfix" } # release url @@ -144,5 +148,16 @@ RELEASE_URL = "https://www.openeuler.org/api-cve/cve-security-notice-server/sync EPOL_DICT = { "openEuler-20.03-LTS": "EPOL", "openEuler-20.03-LTS-SP1": "EPOL", - "openEuler-20.03-LTS-SP2": "EPOL-main" + "openEuler-20.03-LTS-SP2": "EPOL-main", + "openEuler-20.03-LTS-SP3": "EPOL-main" } + +# comment dict +COMMENT_DICT = {"cve": "/cve-ok", "bugfix": "/bugfix-ok", "test": "/test-ok"} + +# label dict +LABEL_DICT = {"start": "check-pkg", "requires": "check-requires", "release": "release-check"} + +MULTI_VERSION_BRANCHS = ["sp2", "sp3", "SP2", "SP3"] + +CHECK_PART_LIST = ["status", "requires", "test", "cve_bugfix"] diff --git a/release-assistant/javcra/libs/config/checkpart/check_requires/support_branch.yaml b/release-assistant/javcra/libs/config/checkpart/check_requires/support_branch.yaml index c53786ab179532f29bc56e3adf0ac4ca6ae1a34d..e18a14892289f54ebadabfb6f23006fd9c9bbd83 100644 --- a/release-assistant/javcra/libs/config/checkpart/check_requires/support_branch.yaml +++ b/release-assistant/javcra/libs/config/checkpart/check_requires/support_branch.yaml @@ -4,4 +4,6 @@ openEuler : openEuler-20.03-LTS-SP1: obs_alias: "openEuler:20.03:LTS:SP1" openEuler-20.03-LTS-SP2: - obs_alias: "openEuler:20.03:LTS:SP2" \ No newline at end of file + obs_alias: "openEuler:20.03:LTS:SP2" + openEuler-20.03-LTS-SP3: + obs_alias: "openEuler:20.03:LTS:SP3" \ No newline at end of file diff --git a/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-20.03-LTS-SP3.repo b/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-20.03-LTS-SP3.repo new file mode 100644 index 0000000000000000000000000000000000000000..41cc1499bc72f3d9fe45f72d4daba7cdeb3afd42 --- /dev/null +++ b/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-20.03-LTS-SP3.repo @@ -0,0 +1,86 @@ +#generic-repos is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 +#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR +#PURPOSE. +#See the Mulan PSL v2 for more details. + +#binary repo + +[published-everything] +name=published-everything +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/everything/$basearch/ +enabled=1 +gpgcheck=0 +priority=2 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/everything/$basearch/RPM-GPG-KEY-openEuler + +[published-update] +name=published-update +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/update/$basearch/ +enabled=1 +gpgcheck=0 +priority=1 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/update/$basearch/RPM-GPG-KEY-openEuler + +[published-debuginfo] +name=published-debuginfo +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/debuginfo/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[devel-obs] +name=devel-obs +baseurl=http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP3/standard_$basearch/ +enabled=1 +gpgcheck=0 +priority=3 + +#source repo + +[published-everything-src] +name=published-everything-src +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/source/$basearch/RPM-GPG-KEY-openEuler + +[published-update-src] +name=published-update-src +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/update/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/update/source/RPM-GPG-KEY-openEuler + +#EPOL binary repo + +[published-EPOL] +name=published-EPOL +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/EPOL/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/OS/$basearch/RPM-GPG-KEY-openEuler + +[published-Epol-src] +name=published-Epol-src +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/EPOL/main/source/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/EPOL/main/source/RPM-GPG-KEY-openEuler + +[published-Epol-update-src] +name=published-Epol-update-src +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/EPOL/update/main/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP3/EPOL/update/main/source/RPM-GPG-KEY-openEuler + +[devel-obs] +name=devel-obs +baseurl=http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP3/standard_$basearch/ +enabled=1 +gpgcheck=0 +priority=3 diff --git a/release-assistant/test/test_check/mock_data/mock_cve_bugfix_comment.txt b/release-assistant/test/test_check/mock_data/mock_cve_bugfix_comment.txt new file mode 100644 index 0000000000000000000000000000000000000000..e5f46a3ed29473433ec4073193c6d8bcfb8adadc --- /dev/null +++ b/release-assistant/test/test_check/mock_data/mock_cve_bugfix_comment.txt @@ -0,0 +1,134 @@ +[ + { + "id": 5785714, + "body": "/bugfix-ok.\nThat means the developers can comment below every pull request or issue to trigger Bot Commands.\nPlease follow instructions at \u003Chttps://gitee.com/openeuler/community/blob/master/en/sig-infrastructure/command.md\u003E to find the details.", + "user": { + "id": 5329419, + "login": "openeuler-ci-bot", + "name": "openeuler-ci-bot", + "avatar_url": "https://portrait.gitee.com/uploads/avatars/user/1776/5329419_openeuler-ci-bot_1578984659.png", + "url": "https://gitee.com/api/v5/users/openeuler-ci-bot", + "html_url": "https://gitee.com/openeuler-ci-bot", + "followers_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/followers", + "following_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/following_url{/other_user}", + "gists_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/gists{/gist_id}", + "starred_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/starred{/owner}{/repo}", + "subscriptions_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/subscriptions", + "organizations_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/orgs", + "repos_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/repos", + "events_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/events{/privacy}", + "received_events_url": "https://gitee.com/api/v5/users/openeuler-ci-bot/received_events", + "type": "User" + }, + "source": null, + "target": { + "issue": { + "id": 6720618, + "number": "I401NU", + "title": "test" + }, + "pull_request": null + }, + "created_at": "2021-07-10T15:41:18+08:00", + "updated_at": "2021-07-10T15:41:18+08:00" + }, + { + "id": 6004607, + "body": "@Mary Please review this issue", + "user": { + "id": 7558519, + "login": "jiangpengjuj", + "name": "jiangpengjuj", + "avatar_url": "https://gitee.com/assets/no_portrait.png", + "url": "https://gitee.com/api/v5/users/jiangpengjuj", + "html_url": "https://gitee.com/jiangpengjuj", + "followers_url": "https://gitee.com/api/v5/users/jiangpengjuj/followers", + "following_url": "https://gitee.com/api/v5/users/jiangpengjuj/following_url{/other_user}", + "gists_url": "https://gitee.com/api/v5/users/jiangpengjuj/gists{/gist_id}", + "starred_url": "https://gitee.com/api/v5/users/jiangpengjuj/starred{/owner}{/repo}", + "subscriptions_url": "https://gitee.com/api/v5/users/jiangpengjuj/subscriptions", + "organizations_url": "https://gitee.com/api/v5/users/jiangpengjuj/orgs", + "repos_url": "https://gitee.com/api/v5/users/jiangpengjuj/repos", + "events_url": "https://gitee.com/api/v5/users/jiangpengjuj/events{/privacy}", + "received_events_url": "https://gitee.com/api/v5/users/jiangpengjuj/received_events", + "type": "User" + }, + "source": null, + "target": { + "issue": { + "id": 6720618, + "number": "I401NU", + "title": "test" + }, + "pull_request": null + }, + "created_at": "2021-07-27T18:57:57+08:00", + "updated_at": "2021-07-27T18:57:57+08:00" + }, + { + "id": 6176316, + "body": "/cve-ok", + "user": { + "id": 2234080, + "login": "Mary", + "name": "Mary", + "avatar_url": "https://portrait.gitee.com/uploads/avatars/user/744/2234080_Mary_1578969378.png", + "url": "https://gitee.com/api/v5/users/Mary", + "html_url": "https://gitee.com/Mary", + "followers_url": "https://gitee.com/api/v5/users/Mary/followers", + "following_url": "https://gitee.com/api/v5/users/Mary/following_url{/other_user}", + "gists_url": "https://gitee.com/api/v5/users/Mary/gists{/gist_id}", + "starred_url": "https://gitee.com/api/v5/users/Mary/starred{/owner}{/repo}", + "subscriptions_url": "https://gitee.com/api/v5/users/Mary/subscriptions", + "organizations_url": "https://gitee.com/api/v5/users/Mary/orgs", + "repos_url": "https://gitee.com/api/v5/users/Mary/repos", + "events_url": "https://gitee.com/api/v5/users/Mary/events{/privacy}", + "received_events_url": "https://gitee.com/api/v5/users/Mary/received_events", + "type": "User" + }, + "source": null, + "target": { + "issue": { + "id": 6720618, + "number": "I401NU", + "title": "test" + }, + "pull_request": null + }, + "created_at": "2021-08-10T10:37:52+08:00", + "updated_at": "2021-08-10T10:37:52+08:00" + }, + { + "id": 6176331, + "body": "/bugfix-ok", + "user": { + "id": 2234080, + "login": "Mary", + "name": "Mary", + "avatar_url": "https://portrait.gitee.com/uploads/avatars/user/744/2234080_Mary_1578969378.png", + "url": "https://gitee.com/api/v5/users/Mary", + "html_url": "https://gitee.com/Mary", + "followers_url": "https://gitee.com/api/v5/users/Mary/followers", + "following_url": "https://gitee.com/api/v5/users/Mary/following_url{/other_user}", + "gists_url": "https://gitee.com/api/v5/users/Mary/gists{/gist_id}", + "starred_url": "https://gitee.com/api/v5/users/Mary/starred{/owner}{/repo}", + "subscriptions_url": "https://gitee.com/api/v5/users/Mary/subscriptions", + "organizations_url": "https://gitee.com/api/v5/users/Mary/orgs", + "repos_url": "https://gitee.com/api/v5/users/Mary/repos", + "events_url": "https://gitee.com/api/v5/users/Mary/events{/privacy}", + "received_events_url": "https://gitee.com/api/v5/users/Mary/received_events", + "type": "User" + }, + "source": null, + "target": { + "issue": { + "id": 6720618, + "number": "I401NU", + "title": "test" + }, + "pull_request": null + }, + "created_at": "2021-08-10T10:38:23+08:00", + "updated_at": "2021-08-10T10:38:23+08:00" + } +] \ No newline at end of file diff --git a/release-assistant/test/test_check/mock_data/mock_post_data.txt b/release-assistant/test/test_check/mock_data/mock_post_data.txt index 802e4e4cb40ef13d84c1013367479e4788c2c843..9696331a18982a29cb5feb31e1c40ed2facdf028 100644 --- a/release-assistant/test/test_check/mock_data/mock_post_data.txt +++ b/release-assistant/test/test_check/mock_data/mock_post_data.txt @@ -1,4 +1,4 @@ { - "error_code": 200, + "error_code": "2000", "error_mesg": "All test suites have been executed." } \ No newline at end of file diff --git a/release-assistant/test/test_check/test_check_cli.py b/release-assistant/test/test_check/test_check_cli.py index 0a2163f73e1e9add2305cdadd97357c958a8e4d3..677d3b0b11652c54541519954b56f5fbdd361999 100644 --- a/release-assistant/test/test_check/test_check_cli.py +++ b/release-assistant/test/test_check/test_check_cli.py @@ -226,13 +226,14 @@ during the operation status, a failure occurred, and the cause of the error was test people review success """ self.expect_str = """ -[INFO] successfully operate test in check part. +[INFO] successfully operate test in check part. """ self.command_params = ["--giteeid=Mary", "--token=example", "--type=test", "--jenkinsuser=mary", "--jenkinskey=marykey", "--ak=forexample", "--sk=forexample", "I40769"] resp = self.make_expect_data(200, 'checkpart.txt') mock_comment_r = self.make_need_content('mock_issue_comment.txt', MOCK_DATA_FILE) - self.mock_request(side_effect=[resp, resp, resp, mock_comment_r]) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, resp, mock_comment_r, mock_cve_bigfix_comment]) self.assert_result() def test_create_issue_comment_failed(self): @@ -312,8 +313,9 @@ Parameter validation failed mock_create_install_issue = self.make_need_content('create_install_issue_success.txt', MOCK_DATA_FILE) mock_checkpart_add_build = self.make_need_content('checkpart_add_build_success.txt', MOCK_DATA_FILE) mock_checkpart_add_install = self.make_need_content('checkpart_add_install_success.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, mock_repo_list_data, mock_create_jenkins_comment, mock_create_jenkins_comment, resp, resp, resp, resp, mock_add_repo_r, mock_create_build_jenkins_comment, mock_create_install_jenkins_comment, mock_create_install_jenkins_comment, resp, resp, @@ -333,7 +335,8 @@ Parameter validation failed self.prepare_jenkins_data() self.prepare_obs_data(delete_status_code=400) resp = self.make_expect_data(200, 'checkpart.txt') - self.mock_request(side_effect=[resp, resp, resp, resp, resp, resp]) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp]) self.assert_result() def test_get_repo_in_table_failed(self): @@ -349,8 +352,9 @@ Parameter validation failed self.mock_subprocess_check_output(return_value=b"published-everything-src") mock_create_jenkins_comment = self.make_need_content('create_jenkins_comments_success.txt', MOCK_DATA_FILE) resp = self.make_expect_data(200, 'checkpart.txt') + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, mock_create_jenkins_comment, resp, resp, resp, resp, RequestException]) self.assert_result() @@ -372,8 +376,9 @@ Parameter validation failed mock_create_install_issue = self.make_need_content('create_install_issue_success.txt', MOCK_DATA_FILE) mock_checkpart_add_build = self.make_need_content('checkpart_add_build_success.txt', MOCK_DATA_FILE) mock_checkpart_add_install = self.make_need_content('checkpart_add_install_success.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, RequestException, resp, resp, resp, resp, mock_add_repo_r, RequestException, RequestException, resp, resp, mock_exist_issues, mock_create_build_issue, resp, resp, mock_create_build_issue, mock_checkpart_add_build, resp, resp, mock_exist_issues, mock_create_install_issue, resp, resp, @@ -394,8 +399,9 @@ Parameter validation failed mock_repo_list_data = self.make_need_content('repo_list_data.txt', MOCK_DATA_FILE) self.mock_subprocess_check_output(return_value=b'published-Epol-src') mock_create_jenkins_comment = self.make_need_content('create_jenkins_comments_success.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, mock_create_jenkins_comment, resp, resp, resp, resp, RequestException]) self.assert_result() @@ -410,7 +416,8 @@ during the operation requires, a failure occurred, and the cause of the error wa "--jenkinskey=marykey", "--ak=forexample", "--sk=forexample", "I40769"] resp = self.make_expect_data(200, 'checkpart.txt') branch_abnormal_r = self.make_need_content('check_branch_abnormal.txt', MOCK_DATA_FILE) - self.mock_request(side_effect=[resp, resp, branch_abnormal_r, branch_abnormal_r, RequestException]) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, mock_cve_bigfix_comment, branch_abnormal_r, branch_abnormal_r, RequestException]) self.assert_result() def test_branch_name_is_none_and_get_update_list_failed(self): @@ -424,8 +431,9 @@ during the operation requires, a failure occurred, and the cause of the error wa "--jenkinskey=marykey", "--ak=forexample", "--sk=forexample", "I40769"] resp = self.make_expect_data(200, 'checkpart.txt') branch_abnormal_r = self.make_need_content('branch_name_is_none.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, branch_abnormal_r, branch_abnormal_r, RequestException]) + side_effect=[resp, resp, mock_cve_bigfix_comment, branch_abnormal_r, branch_abnormal_r, RequestException]) self.assert_result() def test_create_jenkins_comment_failed(self): @@ -443,7 +451,11 @@ during the operation requires, a failure occurred, and the cause of the error wa self.prepare_jenkins_data() self.prepare_obs_data() self.mock_jenkins_build_job(return_value=0) - self.mock_request(return_value=resp) + mock_repo_list_data = self.make_need_content('repo_list_data.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) + self.mock_request( + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, + mock_repo_list_data]) self.assert_result() def test_download_pkg_log_write_back_create_install_build_issue_failed(self): @@ -467,8 +479,9 @@ during the operation requires, a failure occurred, and the cause of the error wa MOCK_DATA_FILE) mock_issue_comment = self.make_need_content('mock_issue_comment.txt', MOCK_DATA_FILE) mock_create_build_issue = self.make_need_content('create_build_issue_success.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, mock_create_jenkins_comment, resp, resp, resp, resp, mock_add_repo_r, mock_create_build_jenkins_comment, mock_create_install_jenkins_comment, resp, resp, mock_exist_issues, mock_issue_comment, mock_create_build_issue, RequestException, @@ -494,8 +507,9 @@ during the operation requires, a failure occurred, and the cause of the error wa MOCK_DATA_FILE) mock_create_build_jenkins_comment = self.make_need_content('create_build_jenkins_comments_success.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, mock_create_jenkins_comment, resp, resp, resp, resp, mock_add_repo_r, mock_create_build_jenkins_comment, mock_create_install_jenkins_comment, resp, resp, mock_exist_issues, RequestException, RequestException]) @@ -522,8 +536,9 @@ during the operation requires, a failure occurred, and the cause of the error wa MOCK_DATA_FILE) mock_create_build_issue = self.make_need_content('create_build_issue_success.txt', MOCK_DATA_FILE) mock_create_install_issue = self.make_need_content('create_install_issue_success.txt', MOCK_DATA_FILE) + mock_cve_bigfix_comment = self.make_need_content('mock_cve_bugfix_comment.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, + side_effect=[resp, resp, mock_cve_bigfix_comment, resp, resp, resp, resp, resp, resp, resp, resp, mock_repo_list_data, mock_create_jenkins_comment, resp, resp, resp, resp, mock_add_repo_r, mock_create_build_jenkins_comment, mock_create_install_jenkins_comment, resp, resp, mock_exist_issues, mock_create_build_issue, resp, resp, mock_create_build_issue, diff --git a/release-assistant/test/test_release/mock_data/mock_test_comments.txt b/release-assistant/test/test_release/mock_data/mock_test_comments.txt new file mode 100644 index 0000000000000000000000000000000000000000..e6e7636f0fc1c6509e5252166a43e51371d2fa65 --- /dev/null +++ b/release-assistant/test/test_release/mock_data/mock_test_comments.txt @@ -0,0 +1,34 @@ +[{ + "id": 6274335, + "body": "/test-ok", + "user": { + "id": 2234080, + "login": "MementoMoriCheng", + "name": "魔箭胖胖", + "avatar_url": "https://portrait.gitee.com/uploads/avatars/user/744/2234080_MementoMoriCheng_1578969378.png", + "url": "https://gitee.com/api/v5/users/MementoMoriCheng", + "html_url": "https://gitee.com/MementoMoriCheng", + "followers_url": "https://gitee.com/api/v5/users/MementoMoriCheng/followers", + "following_url": "https://gitee.com/api/v5/users/MementoMoriCheng/following_url{/other_user}", + "gists_url": "https://gitee.com/api/v5/users/MementoMoriCheng/gists{/gist_id}", + "starred_url": "https://gitee.com/api/v5/users/MementoMoriCheng/starred{/owner}{/repo}", + "subscriptions_url": "https://gitee.com/api/v5/users/MementoMoriCheng/subscriptions", + "organizations_url": "https://gitee.com/api/v5/users/MementoMoriCheng/orgs", + "repos_url": "https://gitee.com/api/v5/users/MementoMoriCheng/repos", + "events_url": "https://gitee.com/api/v5/users/MementoMoriCheng/events{/privacy}", + "received_events_url": "https://gitee.com/api/v5/users/MementoMoriCheng/received_events", + "type": "User" + }, + "source": null, + "target": { + "issue": { + "id": 6674816, + "number": "I3Z2BK", + "title": "你好" + }, + "pull_request": null + }, + "created_at": "2021-08-17T15:40:25+08:00", + "updated_at": "2021-08-17T15:40:25+08:00" + } +] \ No newline at end of file diff --git a/release-assistant/test/test_release/test_release_cli.py b/release-assistant/test/test_release/test_release_cli.py index 1cba1e3ee1710729f7b04d6a62e45f9e9f98ee45..508fef4ee6f4d31c4ab5d0faf026a1f47f739f03 100644 --- a/release-assistant/test/test_release/test_release_cli.py +++ b/release-assistant/test/test_release/test_release_cli.py @@ -50,8 +50,9 @@ remain issues exists, need to delete rpms for repo. MOCK_DATA_FILE) mock_publish_standard_comment = self.make_need_content('publish_standard_comments_success.txt', MOCK_DATA_FILE) mock_publish_epol_comment = self.make_need_content('publish_epol_comments_success.txt', MOCK_DATA_FILE) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) self.mock_request( - side_effect=[resp, resp, resp, resp, resp, resp, mock_remain_issue_data, + side_effect=[resp, resp, test_comment_data, resp, resp, resp, resp, mock_remain_issue_data, mock_delete_remain_standard_comment, mock_delete_remain_epol_comment, mock_publish_standard_comment, mock_publish_epol_comment]) self.assert_result() @@ -70,7 +71,8 @@ during the operation checkok, a failure occurred, and the cause of the error was self.mock_jenkins_build_job(return_value=0) self.mock_subprocess_check_output(return_value=b'published-Epol-src') mock_remain_issue_data = self.make_need_content('mock_remain_issue.txt', MOCK_DATA_FILE) - self.mock_request(side_effect=[resp, resp, resp, resp, resp, resp, mock_remain_issue_data]) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data, resp, resp, resp, resp, mock_remain_issue_data]) self.assert_result() def test_checkok_date_info_not_in_issue_body(self): @@ -87,7 +89,8 @@ during the operation checkok, a failure occurred, and the cause of the error was self.prepare_jenkins_data() self.mock_jenkins_build_job(return_value=0) self.mock_subprocess_check_output(return_value=b'published-Epol-src') - self.mock_request(side_effect=[resp, resp, resp, resp, not_exist_date_info_data]) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data, resp, resp, not_exist_date_info_data]) self.assert_result() def test_checkok_abnormal_date_info(self): @@ -104,7 +107,8 @@ during the operation checkok, a failure occurred, and the cause of the error was self.prepare_jenkins_data() self.mock_jenkins_build_job(return_value=0) self.mock_subprocess_check_output(return_value=b'published-Epol-src') - self.mock_request(side_effect=[resp, resp, resp, resp, abnormal_date_info_data]) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data, resp, resp, abnormal_date_info_data]) self.assert_result() def test_checkok_date_info_index_error(self): @@ -121,7 +125,8 @@ during the operation checkok, a failure occurred, and the cause of the error was self.prepare_jenkins_data() self.mock_jenkins_build_job(return_value=0) self.mock_subprocess_check_output(return_value=b'published-Epol-src') - self.mock_request(side_effect=[resp, resp, resp, resp, abnormal_date_info_data]) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data, resp, resp, abnormal_date_info_data]) self.assert_result() def test_cvrfok_success(self): @@ -135,8 +140,10 @@ successful announcement "--jenkinskey=marykey", "--publishuser=tom", "--publishkey=tomkey", "I40769"] resp = self.make_expect_data(200, 'releasepart.txt') mock_post_data = self.make_need_content('mock_post_data.txt', MOCK_DATA_FILE) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) self.mock_request(return_value=resp) self.mock_requests_post(return_value=mock_post_data) + self.mock_request(side_effect=[resp, resp, test_comment_data]) self.assert_result() def test_cvrfok_successfully_not_in_text(self): @@ -150,7 +157,8 @@ during the operation cvrfok, a failure occurred, and the cause of the error was "--jenkinskey=marykey", "--publishuser=tom", "--publishkey=tomkey", "I40769"] resp = self.make_expect_data(200, 'releasepart.txt') mock_post_data = self.make_need_content('mock_post_failed_data.txt', MOCK_DATA_FILE) - self.mock_request(return_value=resp) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data]) self.mock_requests_post(return_value=mock_post_data) self.assert_result() @@ -166,6 +174,10 @@ during the operation cvrfok, a failure occurred, and the cause of the error was resp = self.make_expect_data(200, 'releasepart.txt') mock_post_data = self.make_object_data(404, "404 not found") self.mock_request(return_value=resp) + + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data]) + self.mock_requests_post(return_value=mock_post_data) self.assert_result() @@ -180,7 +192,8 @@ during the operation cvrfok, a failure occurred, and the cause of the error was "--jenkinskey=marykey", "--publishuser=tom", "--publishkey=tomkey", "I40769"] resp = self.make_expect_data(200, 'releasepart.txt') mock_post_data = self.make_object_data(200, "") - self.mock_request(return_value=resp) + test_comment_data = self.make_need_content('mock_test_comments.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, test_comment_data]) self.mock_requests_post(return_value=mock_post_data) self.assert_result() diff --git a/release-assistant/test/test_start/mock_data/mock_update_label.txt b/release-assistant/test/test_start/mock_data/mock_update_label.txt new file mode 100644 index 0000000000000000000000000000000000000000..b4656e7692ba9cf4178de71d0fa011cdb4cbedf8 --- /dev/null +++ b/release-assistant/test/test_start/mock_data/mock_update_label.txt @@ -0,0 +1 @@ +[{"id":140051492,"name":"feat","color":"ededed","repository_id":16929727,"url":"https://gitee.com/api/v5/repos/tushenmei/release-tools/labels/feat","created_at":"2022-01-06T11:19:37+08:00","updated_at":"2022-01-06T11:19:37+08:00"},{"id":116771435,"name":"bug","color":"DB2828","repository_id":16929727,"url":"https://gitee.com/api/v5/repos/tushenmei/release-tools/labels/bug","created_at":"2021-07-13T11:19:56+08:00","updated_at":"2022-01-06T11:19:37+08:00"},{"id":140107476,"name":"feat1","color":"ededed","repository_id":16929727,"url":"https://gitee.com/api/v5/repos/tushenmei/release-tools/labels/feat1","created_at":"2022-01-06T14:39:54+08:00","updated_at":"2022-01-06T14:39:54+08:00"},{"id":140107477,"name":"bug1","color":"ededed","repository_id":16929727,"url":"https://gitee.com/api/v5/repos/tushenmei/release-tools/labels/bug1","created_at":"2022-01-06T14:39:54+08:00","updated_at":"2022-01-06T14:39:54+08:00"},{"id":140114323,"name":"cccc","color":"ededed","repository_id":16929727,"url":"https://gitee.com/api/v5/repos/tushenmei/release-tools/labels/cccc","created_at":"2022-01-06T15:13:42+08:00","updated_at":"2022-01-06T15:13:42+08:00"},{"id":140114324,"name":"dddd","color":"ededed","repository_id":16929727,"url":"https://gitee.com/api/v5/repos/tushenmei/release-tools/labels/dddd","created_at":"2022-01-06T15:13:42+08:00","updated_at":"2022-01-06T15:13:42+08:00"}] \ No newline at end of file diff --git a/release-assistant/test/test_start/test_start_cli.py b/release-assistant/test/test_start/test_start_cli.py index 5e59b466aa495ca796e6ccaee9f7143117bda930..22e385b22d40f25d7fa85efe30493f2aecddae5f 100644 --- a/release-assistant/test/test_start/test_start_cli.py +++ b/release-assistant/test/test_start/test_start_cli.py @@ -52,7 +52,8 @@ class TestStart(TestMixin): self.mock_obs_cloud_get_objects(return_value=mock_r) read_excel = pd.read_excel(Path(MOCK_DATA_FILE, "mock_cve_data.xlsx"), sheet_name="cve_list") self.mock_pandas_read_excel(return_value=read_excel) - self.mock_request(side_effect=[resp, resp, resp, mock_init_r]) + mock_label = self.make_need_content('mock_update_label.txt', MOCK_DATA_FILE) + self.mock_request(side_effect=[resp, resp, resp, mock_init_r, mock_label]) mock_get_r = self.make_object_data(200, "The number of requests is too frequent, " "please try again later, there is currently a task being processed") self.mock_requests_get(side_effect=[mock_get_r])