diff --git a/release-assistant/javcra/common/constant.py b/release-assistant/javcra/common/constant.py index 3ebd2a49b8b89c1473019af86614a039fddbcfc8..8c248487c90a7c3f0956fc2b7aa0c19bfe72fa1f 100644 --- a/release-assistant/javcra/common/constant.py +++ b/release-assistant/javcra/common/constant.py @@ -75,7 +75,7 @@ X86_FRAME = "x86_64" # branch list for standard epol list BRANCH_LIST = ["openEuler-22.03-LTS-SP2", "openEuler-22.03-LTS-SP1", "openEuler-20.03-LTS-SP1", - "openEuler-20.03-LTS-SP3", "openEuler-22.03-LTS"] + "openEuler-20.03-LTS-SP4", "openEuler-20.03-LTS-SP3", "openEuler-22.03-LTS"] # lts branch LTS_BRANCH = "openEuler-20.03-LTS" @@ -105,6 +105,7 @@ 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-SP4": "openeuler-20.03-lts-sp4", "openEuler-20.03-LTS": "openeuler-20.03-lts", "openEuler-22.03-LTS": "openeuler-22.03-lts", "openEuler-22.03-LTS-SP1": "openeuler-22.03-lts-sp1", @@ -156,6 +157,7 @@ EPOL_DICT = { "openEuler-20.03-LTS-SP1": "EPOL", "openEuler-20.03-LTS-SP2": "EPOL-main", "openEuler-20.03-LTS-SP3": "EPOL-main", + "openEuler-20.03-LTS-SP4": "EPOL-main", "openEuler-22.03-LTS": "EPOL-main", "openEuler-22.03-LTS-SP1": "EPOL-main", "openEuler-22.03-LTS-SP2": "EPOL-main" @@ -167,7 +169,7 @@ 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", "22.03-LTS", "22.03-LTS-SP1", "22.03-LTS-SP2"] +MULTI_VERSION_BRANCHS = ["sp2", "sp3", "sp4", "SP2", "SP3", "SP4", "22.03-LTS", "22.03-LTS-SP1", "22.03-LTS-SP2"] CHECK_PART_LIST = ["status", "requires", "test", "cve_bugfix", "versions"] @@ -195,6 +197,10 @@ BRANCH_MAP = { "openEuler:20.03:LTS:SP3", "openEuler:20.03:LTS:SP3:Epol", ], + "openEuler-20.03-LTS-SP4": [ + "openEuler:20.03:LTS:SP4", + "openEuler:20.03:LTS:SP4:Epol", + ], "openEuler-22.03-LTS": ["openEuler:22.03:LTS", "openEuler:22.03:LTS:Epol"], "openEuler-22.03-LTS-SP1": [ "openEuler:22.03:LTS:SP1", @@ -242,6 +248,11 @@ OBS_VALUES_NAMES = { "openEuler:20.03:LTS:SP3:Epol", "openEuler:20.03:LTS:SP3:Extras", ], + "openEuler-20.03-LTS-SP4": [ + "openEuler:20.03:LTS:SP4", + "openEuler:20.03:LTS:SP4:Epol", + "openEuler:20.03:LTS:SP4 :Extras", + ], "openEuler-22.03-LTS": [ "openEuler:22.03:LTS", "openEuler:22.03:LTS:Epol", @@ -262,6 +273,7 @@ OBS_VALUES_NAMES = { VM_IP_MAP = { "openEuler-20.03-LTS-SP1": "172.16.1.32", "openEuler-20.03-LTS-SP3": "172.16.1.32", + "openEuler-20.03-LTS-SP4": "172.16.1.32", "openEuler-22.03-LTS": "172.16.1.32", "openEuler-22.03-LTS-SP1": "172.16.1.95", "openEuler-22.03-LTS-SP2": "172.16.1.155" @@ -270,6 +282,7 @@ VM_IP_MAP = { ISO_BUILD_JOB_MAP = { "openEuler-20.03-LTS-SP1": "openEuler-OS-build/Main-openEuler-20.03-LTS-SP1-build", "openEuler-20.03-LTS-SP3": "openEuler-OS-build/Main-openEuler-20.03-LTS-SP3-build", + "openEuler-20.03-LTS-SP4": "EBS-OS-build/Main-openEuler-20.03-LTS-SP4-EBS", "openEuler-22.03-LTS": "openEuler-OS-build/Main-openEuler-22.03-LTS-build", "openEuler-22.03-LTS-SP1": "EBS-OS-build/Main-openEuler-22.03-LTS-SP1-EBS", "openEuler-22.03-LTS-SP2": "EBS-OS-build/Main-openEuler-22.03-LTS-SP2-EBS" @@ -286,8 +299,9 @@ TESTER = "@gitee-cmd @zhangtao2020 @disnight" # check cvrf and package's configuration VERSION_LIST = ["openEuler-22.03-LTS", "openEuler-22.03-LTS-SP1", "openEuler-20.03-LTS-SP1", "openEuler-20.03-LTS-SP3", - "openEuler-22.03-LTS-SP2", "openEuler-22.03-LTS/EPOL", "openEuler-22.03-LTS-SP1/EPOL", - "openEuler-20.03-LTS-SP1/EPOL", "openEuler-20.03-LTS-SP3/EPOL", "openEuler-22.03-LTS-SP2/EPOL"] + "openEuler-20.03-LTS-SP4", "openEuler-22.03-LTS-SP2", "openEuler-22.03-LTS/EPOL", + "openEuler-22.03-LTS-SP1/EPOL", "openEuler-20.03-LTS-SP1/EPOL", "openEuler-20.03-LTS-SP3/EPOL", + "openEuler-20.03-LTS-SP4/EPOL", "openEuler-22.03-LTS-SP2/EPOL"] ARCH_LIST = ["aarch64", "source", "x86_64", "noarch"] # openEuler test repo url 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 e2ccc908760f5be16b03e73a7f8b84e1b84e03b4..fff64efe33ee29d836f971478caff6e9d1a41015 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 @@ -7,6 +7,8 @@ openEuler : obs_alias: "openEuler:20.03:LTS:SP2" openEuler-20.03-LTS-SP3: obs_alias: "openEuler:20.03:LTS:SP3" + openEuler-20.03-LTS-SP4: + obs_alias: "openEuler:20.03:LTS:SP4" openEuler-22.03-LTS: obs_alias: "openEuler:22.03:LTS" openEuler-22.03-LTS-SP1: diff --git a/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-20.03-LTS-SP4.repo b/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-20.03-LTS-SP4.repo new file mode 100644 index 0000000000000000000000000000000000000000..59149dfa6b4fe9fe3129e46fdc62f4597816ae04 --- /dev/null +++ b/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-20.03-LTS-SP4.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-SP4/everything/$basearch/ +enabled=1 +gpgcheck=0 +priority=2 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/everything/$basearch/RPM-GPG-KEY-openEuler + +[published-update] +name=published-update +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/update/$basearch/ +enabled=1 +gpgcheck=0 +priority=1 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/update/$basearch/RPM-GPG-KEY-openEuler + +[published-debuginfo] +name=published-debuginfo +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/debuginfo/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[devel-obs] +name=devel-obs +baseurl=http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP4/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-SP4/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/source/$basearch/RPM-GPG-KEY-openEuler + +[published-update-src] +name=published-update-src +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/update/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/update/source/RPM-GPG-KEY-openEuler + +#EPOL binary repo + +[published-EPOL] +name=published-EPOL +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/EPOL/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/OS/$basearch/RPM-GPG-KEY-openEuler + +[published-Epol-src] +name=published-Epol-src +baseurl=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/EPOL/main/source/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/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-SP4/EPOL/update/main/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-20.03-LTS-SP4/EPOL/update/main/source/RPM-GPG-KEY-openEuler + +[devel-obs] +name=devel-obs +baseurl=http://119.3.219.20:82/openEuler:/20.03:/LTS:/SP4:/Epol/standard_$basearch/ +enabled=1 +gpgcheck=0 +priority=3