From 3c2f843271b3eb9d8a32c51b726f244a4d665a2a Mon Sep 17 00:00:00 2001 From: liuqi <469227928@qq.com> Date: Tue, 11 Jul 2023 14:22:17 +0800 Subject: [PATCH 1/2] fix issue without arch filter --- src/build/gitee_comment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build/gitee_comment.py b/src/build/gitee_comment.py index 7b3260b..43ba9ce 100755 --- a/src/build/gitee_comment.py +++ b/src/build/gitee_comment.py @@ -272,7 +272,7 @@ class Comment(object): with open('check_build.yaml', 'r') as f: check_branches = yaml.safe_load(f) tbranch = os.getenv('tbranch') - if tbranch not in check_branches.keys(): + if check_branches and tbranch not in check_branches.keys(): return comments for build in builds: name, _ = JenkinsProxy.get_job_path_build_no_from_build_url(build["url"]) -- Gitee From b29458cfcbfe9fce1ef42baf2cf41ab7a4f92190 Mon Sep 17 00:00:00 2001 From: wanghuan158 Date: Fri, 4 Aug 2023 10:39:07 +0800 Subject: [PATCH 2/2] support 23.09 --- src/ac/framework/ac.yaml | 2 ++ src/build/osc_build_k8s.py | 2 +- src/conf/project_host_mapping.yaml | 3 +++ src/constant.py | 1 + src/lib/main_process.sh | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ac/framework/ac.yaml b/src/ac/framework/ac.yaml index fb77c11..d11491b 100644 --- a/src/ac/framework/ac.yaml +++ b/src/ac/framework/ac.yaml @@ -50,11 +50,13 @@ openeuler: hint: check_sca module: sca.check_sca entry: CheckSCA + exclude: True deny_list: ["bishengjdk-17", "bishengjdk-8", "bishengjdk-11", "bishengjdk-riscv", "gcc", "kernel"] openlibing: hint: code module: openlibing.check_code entry: CheckCode + exclude: True allow_list: ["pkgship", "kunpengsecl", "release-tools", "yocto-meta-openeuler", "yocto-embedded-tools", "gcc", "gcc-anti-sca", "A-Ops", "openeuler-jenkins", "lcr", "eggo", "oecp", "etmem", "A-Tune", "libkae", "KubeOS", "ci-bot", "iSulad", "gazelle", "clibcni", "secGear", "eulerfs", "oemaker", diff --git a/src/build/osc_build_k8s.py b/src/build/osc_build_k8s.py index 99d7a46..e4fcf53 100755 --- a/src/build/osc_build_k8s.py +++ b/src/build/osc_build_k8s.py @@ -32,7 +32,7 @@ class SinglePackageBuild(object): """ BUILD_IGNORED_GITEE_BRANCH = ["riscv"] PACKAGES_USE_ROOT = ["iproute", "libaio", "A-Ops", "multipath-tools", "libnetfilter_conntrack", "mcelog", - "openEuler_chroot", "conntrack-tools", "linux-sgx", "gala-gopher", "iputils"] + "openEuler_chroot", "conntrack-tools", "linux-sgx", "gala-gopher", "iputils", "sysboost"] def __init__(self, package, arch, target_branch): """ diff --git a/src/conf/project_host_mapping.yaml b/src/conf/project_host_mapping.yaml index 8bb65ac..6e982ac 100644 --- a/src/conf/project_host_mapping.yaml +++ b/src/conf/project_host_mapping.yaml @@ -50,6 +50,9 @@ backend_002: - openEuler:23.03 - openEuler:23.03:Epol - openEuler:23.03:selfbuild + - openEuler:23.09 + - openEuler:23.09:Epol + - openEuler:23.09:selfbuild - openEuler:22.03:LTS:SP2 - openEuler:22.03:LTS:SP2:Epol - openEuler:22.03:LTS:SP2:Epol:Multi-Version:OpenStack:Train diff --git a/src/constant.py b/src/constant.py index dd8b8b2..20a25e3 100644 --- a/src/constant.py +++ b/src/constant.py @@ -47,6 +47,7 @@ class Constant(object): "openEuler-22.03-LTS-SP2": ["openEuler:22.03:LTS:SP2", "openEuler:22.03:LTS:SP2:Epol"], "openEuler-22.09": ["openEuler:22.09", "openEuler:22.09:Epol"], "openEuler-23.03": ["openEuler:23.03", "openEuler:23.03:Epol"], + "openEuler-23.09": ["openEuler:23.09", "openEuler:23.09:Epol"], "Multi-Version_obs-server-2.10.11_openEuler-22.09": [ "openEuler:22.09:Epol:Multi-Version:obs-server:2.10.11", "openEuler:22.09", "openEuler:22.09:Epol"], diff --git a/src/lib/main_process.sh b/src/lib/main_process.sh index 9c9acd9..19d8bf6 100644 --- a/src/lib/main_process.sh +++ b/src/lib/main_process.sh @@ -30,7 +30,7 @@ build-root = ${BUILD_ROOT} [http://117.78.1.88] user = ${OBSUserName} pass = ${OBSPassword} -trusted_prj = openEuler:22.03:LTS:SP2:selfbuild:BaseOS openEuler:22.03:LTS:SP1:selfbuild:BaseOS openEuler:Factory openEuler:Mainline openEuler:Epol openEuler:BaseTools openEuler:C openEuler:Common_Languages_Dependent_Tools openEuler:Erlang openEuler:Golang openEuler:Java openEuler:KernelSpace openEuler:Lua openEuler:Meson openEuler:MultiLanguage openEuler:Nodejs openEuler:Ocaml openEuler:Perl openEuler:Python openEuler:Qt openEuler:Ruby openEuler:selfbuild:BaseOS openEuler:22.09:selfbuild:BaseOS openEuler:22.03:LTS:LoongArch:selfbuild:BaseOS openEuler:22.03:LTS:selfbuild:BaseOS openEuler:22.03:LTS:Next:selfbuild:BaseOS openEuler:20.03:LTS:SP3:selfbuild:BaseOS openEuler:selfbuild:BaseOS openEuler:20.03:LTS:selfbuild:BaseOS openEuler:selfbuild:function openEuler:20.09:selfbuild:BaseOS openEuler:20.03:LTS:SP1:selfbuild:BaseOS openEuler:21.03:selfbuild:BaseOS openEuler:20.03:LTS:SP2:selfbuild:BaseOS openEuler:21.09:selfbuild:BaseOS openEuler:20.03:LTS:Next:selfbuild:BaseOS openEuler:23.03:selfbuild:BaseOS # 不用输0,1,2了 +trusted_prj = openEuler:22.03:LTS:SP2:selfbuild:BaseOS openEuler:22.03:LTS:SP1:selfbuild:BaseOS openEuler:Factory openEuler:Mainline openEuler:Epol openEuler:BaseTools openEuler:C openEuler:Common_Languages_Dependent_Tools openEuler:Erlang openEuler:Golang openEuler:Java openEuler:KernelSpace openEuler:Lua openEuler:Meson openEuler:MultiLanguage openEuler:Nodejs openEuler:Ocaml openEuler:Perl openEuler:Python openEuler:Qt openEuler:Ruby openEuler:selfbuild:BaseOS openEuler:22.09:selfbuild:BaseOS openEuler:22.03:LTS:LoongArch:selfbuild:BaseOS openEuler:22.03:LTS:selfbuild:BaseOS openEuler:22.03:LTS:Next:selfbuild:BaseOS openEuler:20.03:LTS:SP3:selfbuild:BaseOS openEuler:selfbuild:BaseOS openEuler:20.03:LTS:selfbuild:BaseOS openEuler:selfbuild:function openEuler:20.09:selfbuild:BaseOS openEuler:20.03:LTS:SP1:selfbuild:BaseOS openEuler:21.03:selfbuild:BaseOS openEuler:20.03:LTS:SP2:selfbuild:BaseOS openEuler:21.09:selfbuild:BaseOS openEuler:20.03:LTS:Next:selfbuild:BaseOS openEuler:23.03:selfbuild:BaseOS openEuler:23.09:selfbuild:BaseOS # 不用输0,1,2了 EOF log_info "***** End to config osc *****" } -- Gitee