diff --git a/config/config.ini b/config/config.ini index 264ff26be1025df58c45f11b3cb2124a7b5e03c2..1678a455ea0c444c2c89f3b2a2f373b17ac27214 100644 --- a/config/config.ini +++ b/config/config.ini @@ -6,6 +6,7 @@ openEuler-20.09 = True openEuler-21.03 = True openEuler-20.03-LTS-SP1 = True openEuler-20.03-LTS-SP2 = True +openEuler-21.09 = True oepkg_openstack-common_oe-20.03-LTS-SP2 = True oepkg_openstack-queens_oe-20.03-LTS-SP2 = True oepkg_openstack-rocky_oe-20.03-LTS-SP2 = True @@ -24,6 +25,7 @@ openEuler-20.03-LTS-SP1 = openEuler:20.03:LTS:SP1 openEuler:20.03:LTS:SP1:Epol o openEuler-20.03-LTS-Next = openEuler:20.03:LTS:Next openEuler:20.03:LTS:Next:Epol openEuler:20.03:LTS:Next:Extras openEuler-21.03 = openEuler:21.03 openEuler:21.03:Epol openEuler:21.03:Extras openEuler-20.03-LTS-SP2 = openEuler:20.03:LTS:SP2 openEuler:20.03:LTS:SP2:Epol openEuler:20.03:LTS:SP2:Extras +openEuler-21.09 = openEuler:21.09 openEuler:21.09:Epol openEuler:21.09:Extras oepkg_openstack-common_oe-20.03-LTS-SP2 = openEuler:20.03:LTS:SP2:oepkg:openstack:common oepkg_openstack-queens_oe-20.03-LTS-SP2 = openEuler:20.03:LTS:SP2:oepkg:openstack:queens oepkg_openstack-rocky_oe-20.03-LTS-SP2 = openEuler:20.03:LTS:SP2:oepkg:openstack:rocky @@ -50,6 +52,8 @@ openEuler-20.09 = openEuler:20.09:selfbuild:BaseOS/openEuler_20.09_aarch64 openE openEuler-20.09-Epol = openEuler:20.09:selfbuild:BaseOS/openEuler_20.09_epol_aarch64 openEuler:20.09:selfbuild:BaseOS/openEuler_20.09_epol_x86_64 openEuler-21.03 = openEuler:21.03:selfbuild:BaseOS/openeuler_21.03_standard_aarch64 openEuler:21.03:selfbuild:BaseOS/openeuler_21.03_standard_x86_64 openEuler-21.03-Epol = openEuler:21.03:selfbuild:BaseOS/openeuler_21.03_epol_aarch64 openEuler:21.03:selfbuild:BaseOS/openeuler_21.03_epol_x86_64 +openEuler-21.09 = openEuler:21.09:selfbuild:BaseOS/openeuler_21.09_standard_aarch64 openEuler:21.09:selfbuild:BaseOS/openeuler_21.09_standard_x86_64 +openEuler-21.09-Epol = openEuler:21.09:selfbuild:BaseOS/openeuler_21.09_epol_aarch64 openEuler:21.09:selfbuild:BaseOS/openeuler_21.09_epol_x86_64 openEuler-20.03-LTS-SP2-oepkg-openstack-common = openEuler:20.03:LTS:SP2:selfbuild:BaseOS/openeuler_20.03_lts_sp2_oepkg_openstack_common_aarch64 openEuler:20.03:LTS:SP2:selfbuild:BaseOS/openeuler_20.03_lts_sp2_oepkg_openstack_common_x86_64 openEuler-20.03-LTS-SP2-oepkg-openstack-queens = openEuler:20.03:LTS:SP2:selfbuild:BaseOS/openeuler_20.03_lts_sp2_oepkg_openstack_queens_aarch64 openEuler:20.03:LTS:SP2:selfbuild:BaseOS/openeuler_20.03_lts_sp2_oepkg_openstack_queens_x86_64 openEuler-20.03-LTS-SP2-oepkg-openstack-rocky = openEuler:20.03:LTS:SP2:selfbuild:BaseOS/openeuler_20.03_lts_sp2_oepkg_openstack_rocky_aarch64 openEuler:20.03:LTS:SP2:selfbuild:BaseOS/openeuler_20.03_lts_sp2_oepkg_openstack_rocky_x86_64 diff --git a/core/package_manager.py b/core/package_manager.py index cd984d5c7f1bbf490f41237791bbef9793460bca..5a5d1e0dec6c3aaca90232631d88b7a3f676b9e3 100755 --- a/core/package_manager.py +++ b/core/package_manager.py @@ -44,7 +44,10 @@ class OBSPkgManager(object): """ self.kwargs = kwargs self.init_path = self.kwargs["init_path"] + self.commitid = self.kwargs["cm_id"] self.obs_meta_path = self.kwargs["obs_meta_path"] + cmd = "cd %s && git reset --hard %s && cd -" % (self.obs_meta_path, self.commitid) + ret = os.system(cmd) self.patch_file_path = os.path.join(self.init_path, "diff_patch") self.giteeUserName = self.kwargs["gitee_user"] self.giteeUserPwd = self.kwargs["gitee_pwd"] diff --git a/core/sync_pckg_mgmt.py b/core/sync_pckg_mgmt.py index 673a4d9902efd1091febe5fbf756dade39f91336..456dfeeecb91adef1f3f58e36d5fb481d4a62995 100644 --- a/core/sync_pckg_mgmt.py +++ b/core/sync_pckg_mgmt.py @@ -187,7 +187,7 @@ class SyncPckgMgmt(object): if not os.path.exists(pkg_service_path): cmd = "cp %s/_service %s/_service" % (from_pkg_path, pkg_path) if os.system(cmd) == 0: - cmd = "sed -i 's/%s/%s/g' %s/_service" % (branch, tmp['branch_to'], pkg_path) + cmd = "sed -i 's/%s\//%s\//g' %s/_service" % (branch, tmp['branch_to'], pkg_path) if os.system(cmd) == 0: log.info("add %s %s %s _service succeed!" % (tmp['branch_to'], tmp['obs_to'], tmp['pkgname'])) else: diff --git a/openeuler_obs.py b/openeuler_obs.py index 8dab4d9274caefcfa3deffb14a6771166e6f0c35..325dad5812dc52c729adf135fd77689979b787ac 100644 --- a/openeuler_obs.py +++ b/openeuler_obs.py @@ -87,6 +87,8 @@ par.add_argument("-at", "--access_token", default=False, help="gitee access_token number used for api get", required=False) par.add_argument("-prid", "--pr_id", default=False, help="use the pr_id to get this pullrequest", required=False) +par.add_argument("-cmid", "--cm_id", default=False, + help="use the commit id to reset gitee repository", required=False) par.add_argument("-sc", "--sync_code", default=True, help="when adding package to project or changing package project, \ the code should be synchronized. type bool, default True", required=False) @@ -143,6 +145,7 @@ kw = { "check_pkg_service": args.check_pkg_service, "access_token": args.access_token, "pr_id": args.pr_id, + "cm_id": args.cm_id, "sync_code": args.sync_code, "all": args.ALL_, "sync_gitee_to_obs": args.sync_gitee_to_obs, diff --git a/releasenode.txt b/releasenode.txt index d91c1d453e3ff0d5e26e279154e102e8679ff9cc..1ee400deeb7d5cf4f62717990ed8e63ceab2d5aa 100644 --- a/releasenode.txt +++ b/releasenode.txt @@ -1,6 +1,7 @@ v1.3.4: - change to correct time collection - add check for rease_management + - update config file and fix _service error and fix gitee repo error v1.3.3: - add new tool for getting time from obs building to iso - support collect rpms for openEuler-20.03-LTS-Next in oepkg