diff --git a/.gitignore b/.gitignore deleted file mode 100644 index d84da7bfa57c6c3a1cffa4401f87e9d6a5a20bbf..0000000000000000000000000000000000000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.DS_Store -*/.DS_Store -*.pyc -*.vscode diff --git a/release-assistant/javcra/cli/commands/checkpart.py b/release-assistant/javcra/cli/commands/checkpart.py index c2cc682aab4ef724f58cc4168e579ea8f23720af..ce3138f3681d5e1a72b609324863bb0159b89698 100644 --- a/release-assistant/javcra/cli/commands/checkpart.py +++ b/release-assistant/javcra/cli/commands/checkpart.py @@ -17,6 +17,7 @@ Class:CheckCommand import os import stat import uuid + from javcra.api.jenkins_api import JenkinsJob from javcra.application.checkpart.checkentrance import CheckEntrance from javcra.application.checkpart.checktest import CheckTest diff --git a/release-assistant/javcra/common/constant.py b/release-assistant/javcra/common/constant.py index 60b8559a71dea6880ca7e5a50f65c911658fedf6..eeb3c3e0d370211b0263a28d3261292fb0e2ad23 100644 --- a/release-assistant/javcra/common/constant.py +++ b/release-assistant/javcra/common/constant.py @@ -74,7 +74,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-SP3", "openEuler-22.03-LTS"] +BRANCH_LIST = ["openEuler-22.03-LTS-SP1", "openEuler-20.03-LTS-SP1", "openEuler-20.03-LTS-SP3", "openEuler-22.03-LTS"] # lts branch LTS_BRANCH = "openEuler-20.03-LTS" @@ -105,7 +105,8 @@ ACTUATOR_DICT = { "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", - "openEuler-22.03-LTS": "openeuler-22.03-lts" + "openEuler-22.03-LTS": "openeuler-22.03-lts", + "openEuler-22.03-LTS-SP1": "openeuler-22.03-lts-sp1" } # git warehouse address for release issue @@ -153,7 +154,8 @@ EPOL_DICT = { "openEuler-20.03-LTS-SP1": "EPOL", "openEuler-20.03-LTS-SP2": "EPOL-main", "openEuler-20.03-LTS-SP3": "EPOL-main", - "openEuler-22.03-LTS": "EPOL-main" + "openEuler-22.03-LTS": "EPOL-main", + "openEuler-22.03-LTS-SP1": "EPOL-main" } # comment dict 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 8ba4925efc970eb4e33eb21bdaf416187172a986..574761d3f5d9f1cb1d444bcb1f14d460180543ba 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 @@ -9,3 +9,5 @@ openEuler : obs_alias: "openEuler:20.03:LTS:SP3" openEuler-22.03-LTS: obs_alias: "openEuler:22.03:LTS" + openEuler-22.03-LTS-SP1: + obs_alias: "openEuler:22.03:LTS:SP1" diff --git a/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-22.03-LTS-SP1.repo b/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-22.03-LTS-SP1.repo new file mode 100644 index 0000000000000000000000000000000000000000..c0f0ac836812aed6fd93d95884ee501729e891a7 --- /dev/null +++ b/release-assistant/javcra/libs/config/checkpart/check_requires/yum.repo/openEuler-22.03-LTS-SP1.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-22.03-LTS-SP1/everything/$basearch/ +enabled=1 +gpgcheck=0 +priority=2 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/everything/$basearch/RPM-GPG-KEY-openEuler + +[published-update] +name=published-update +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/$basearch/ +enabled=1 +gpgcheck=0 +priority=1 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/$basearch/RPM-GPG-KEY-openEuler + +[published-debuginfo] +name=published-debuginfo +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/debuginfo/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[devel-obs] +name=devel-obs +baseurl=http://119.3.219.20:82/openEuler:/22.03:/LTS/standard_$basearch/ +enabled=1 +gpgcheck=0 +priority=3 + +#source repo + +[published-everything-src] +name=published-everything-src +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/source/$basearch/RPM-GPG-KEY-openEuler + +[published-update-src] +name=published-update-src +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/source/RPM-GPG-KEY-openEuler + +#EPOL binary repo + +[published-EPOL] +name=published-EPOL +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler + +[published-Epol-src] +name=published-Epol-src +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/main/source/ +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/main/source/RPM-GPG-KEY-openEuler + +[published-Epol-update-src] +name=published-Epol-update-src +baseurl=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/update/main/source +enabled=0 +gpgcheck=0 +gpgkey=https://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/update/main/source/RPM-GPG-KEY-openEuler + +[devel-obs] +name=devel-obs +baseurl=http://119.3.219.20:82/openEuler:/22.03:/LTS:/SP1:/Epol/standard_$basearch/ +enabled=1 +gpgcheck=0 +priority=3