From 13296575d4f3c39578d3fb1e25d867cd62f9416c Mon Sep 17 00:00:00 2001 From: wanghuan158 Date: Thu, 12 Oct 2023 14:28:57 +0800 Subject: [PATCH] modift 23.09 commit --- src/ac/framework/ac.py | 8 +++++++- src/build/osc_build_k8s.py | 5 +++++ src/constant.py | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ac/framework/ac.py b/src/ac/framework/ac.py index 16897a5..c3adeca 100644 --- a/src/ac/framework/ac.py +++ b/src/ac/framework/ac.py @@ -120,7 +120,13 @@ class AC(object): :return: """ target_branch = kwargs.get("tbranch") - if target_branch.lower() in Constant.STOPPED_MAINTENANCE_BRANCH: + if target_branch.lower() in Constant.PLAN_STOP_MAINTENANCE_BRANCH: + logger.error("%s planned EOL: 2024/03, we will first close the access control project for release. If you " + "need to contribute the necessary PR, you can contact CICD sig to open it after obtaining the " + "consent of release sig.", target_branch) + self._ac_check_result.append({"name": "Branch is not maintained", "result": 2}) + return + elif target_branch.lower() in Constant.STOPPED_MAINTENANCE_BRANCH: logger.error("%s is no longer maintained, and access control is no longer checked.", target_branch) self._ac_check_result.append({"name": "Branch is not maintained", "result": 2}) return diff --git a/src/build/osc_build_k8s.py b/src/build/osc_build_k8s.py index c56c62d..1775ea1 100755 --- a/src/build/osc_build_k8s.py +++ b/src/build/osc_build_k8s.py @@ -192,6 +192,11 @@ class SinglePackageBuild(object): if self._branch.lower() in Constant.STOPPED_MAINTENANCE_BRANCH: logger.error("branch \"%s\" is no longer maintained!", self._branch) return 1 + if self._branch.lower() in Constant.PLAN_STOP_MAINTENANCE_BRANCH: + logger.error("%s planned EOL: 2024/03, we will first close the access control project for release. If you " + "need to contribute the necessary PR, you can contact CICD sig to open it after obtaining the " + "consent of release sig.", self._branch) + return 1 if self._branch not in Constant.GITEE_BRANCH_PROJECT_MAPPING: logger.error("branch \"%s\" not support yet", self._branch) return 1 diff --git a/src/constant.py b/src/constant.py index 2a97553..6ed06de 100644 --- a/src/constant.py +++ b/src/constant.py @@ -139,7 +139,9 @@ class Constant(object): ] STOPPED_MAINTENANCE_BRANCH = ["openeuler-20.03-lts-next", "openeuler-20.03-lts", "openeuler-20.03-lts-sp2", - "openeuler-21.03", "openeuler-21.09", "openeuler-23.03", "openeuler-23.09"] + "openeuler-21.03", "openeuler-21.09", "openeuler-23.03"] + + PLAN_STOP_MAINTENANCE_BRANCH = ["openeuler-23.09"] ALARM_LTS_BRANCH = ["openeuler-20.03-lts-sp1", "openeuler-20.03-lts-sp3", "openeuler-22.03-lts"] -- Gitee