From 5eeefaad7140a85cae09637e7d24f4147cd261a6 Mon Sep 17 00:00:00 2001 From: dongjie110 <17621827400@163.com> Date: Wed, 13 Jul 2022 14:17:15 +0800 Subject: [PATCH] adapt 2209 branch sync to obs_meta --- config/config.ini | 4 ++++ core/package_manager.py | 2 +- core/sync_pckg_mgmt.py | 50 +++++++++++++++++++++++++++++++---------- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/config/config.ini b/config/config.ini index 75b3138..922ee3f 100644 --- a/config/config.ini +++ b/config/config.ini @@ -11,6 +11,7 @@ openEuler-21.09 = True openEuler-22.03-LTS-Next = True openEuler-22.03-LTS = True openEuler-22.03-LTS-LoongArch = True +openEuler-22.09 = True oepkg_openstack-train_oe-20.03-LTS-SP1 = True oepkg_openstack-common_oe-20.03-LTS-SP2 = True oepkg_openstack-queens_oe-20.03-LTS-SP2 = True @@ -42,6 +43,7 @@ openEuler-21.09 = openEuler:21.09 openEuler:21.09:Epol openEuler:21.09:Extras openEuler-22.03-LTS-Next = openEuler:22.03:LTS:Next openEuler:22.03:LTS:Next:Epol openEuler:22.03:LTS:Next:Extras openEuler-22.03-LTS = openEuler:22.03:LTS openEuler:22.03:LTS:Epol openEuler:22.03:LTS:Extras openEuler-22.03-LTS-LoongArch = openEuler:22.03:LTS:LoongArch +openEuler-22.09 = openEuler:22.09 openEuler:22.09:Epol oepkg_openstack-train_oe-20.03-LTS-SP1 = openEuler:20.03:LTS:SP1:oepkg:openstack:train 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 @@ -84,6 +86,8 @@ openEuler-22.03-LTS-Next = openEuler:22.03:LTS:Next:selfbuild:BaseOS/openeuler_2 openEuler-22.03-LTS-Next-Epol = openEuler:22.03:LTS:Next:selfbuild:BaseOS/openeuler_22.03_lts_next_epol_aarch64 openEuler:22.03:LTS:Next:selfbuild:BaseOS/openeuler_22.03_lts_next_epol_x86_64 openEuler-22.03-LTS = openEuler:22.03:LTS:selfbuild:BaseOS/openeuler_22.03_lts_standard_aarch64 openEuler:22.03:LTS:selfbuild:BaseOS/openeuler_22.03_lts_standard_x86_64 openEuler-22.03-LTS-Epol = openEuler:22.03:LTS:selfbuild:BaseOS/openeuler_22.03_lts_epol_aarch64 openEuler:22.03:LTS:selfbuild:BaseOS/openeuler_22.03_lts_epol_x86_64 +openEuler-22.09 = openEuler:22.09:selfbuild:BaseOS/openeuler_22.09_standard_aarch64 openEuler:22.09:selfbuild:BaseOS/openeuler_22.09_standard_x86_64 +openEuler-22.09-Epol = openEuler:22.09:selfbuild:BaseOS/openeuler_22.09_epol_aarch64 openEuler:22.09:selfbuild:BaseOS/openeuler_22.09_epol_x86_64 openEuler-22.03-LTS-LoongArch = openEuler:22.03:LTS:LoongArch:selfbuild:BaseOS/openeuler_22.03_lts_loongarch_standard_aarch64 openEuler:22.03:LTS:LoongArch:selfbuild:BaseOS/openeuler_22.03_lts_loongarch_standard_loongarch64 openEuler:22.03:LTS:LoongArch:selfbuild:BaseOS/openeuler_22.03_lts_loongarch_standard_x86_64 openEuler-20.03-LTS-SP1-oepkg-openstack-train = openEuler:20.03:LTS:SP1:selfbuild:BaseOS/openeuler_20.03_lts_sp1_oepkg_openstack_train_aarch64 openEuler:20.03:LTS:SP1:selfbuild:BaseOS/openeuler_20.03_lts_sp1_oepkg_openstack_train_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 diff --git a/core/package_manager.py b/core/package_manager.py index 4a2fe92..e9246b1 100755 --- a/core/package_manager.py +++ b/core/package_manager.py @@ -316,7 +316,7 @@ class OBSPkgManager(object): for line in data: file_content.append(line.strip('\n')) data.close() - with ThreadPoolExecutor(10) as executor: + with ThreadPoolExecutor(50) as executor: for content in file_content: executor.submit(self._obs_pkg_action, content) diff --git a/core/sync_pckg_mgmt.py b/core/sync_pckg_mgmt.py index e0e18d9..ebf73f2 100644 --- a/core/sync_pckg_mgmt.py +++ b/core/sync_pckg_mgmt.py @@ -24,6 +24,7 @@ import shutil now_path = os.path.join(os.path.split(os.path.realpath(__file__))[0]) sys.path.append(os.path.join(now_path, "..")) from common.log_obs import log +from common.parser_config import ParserConfigIni class SyncPckgMgmt(object): @@ -40,6 +41,8 @@ class SyncPckgMgmt(object): self.giteeuserpwd = self.kwargs['gitee_pwd'] self.obs_meta_path = self.kwargs['obs_meta_path'] self.release_management_path = self.kwargs['release_management_path'] + par = ParserConfigIni() + self.obs_ignored_package = par.get_obs_ignored_package() def _get_change_file(self): """ @@ -188,6 +191,22 @@ class SyncPckgMgmt(object): f.write(file_msg) f.close() + def _write_service_file(self, filepath, package, pkg_branch): + ''' + write service file + ''' + file_msg = """ + + repo + next/{}/{} + +""".format(pkg_branch,package) + try: + with open(os.path.join(filepath,'_service'),'w') as f: + f.write(file_msg) + except Exception as e: + print (e) + def _add_pkg_service(self, tmp): """ add obs_meta packages _service file @@ -195,22 +214,29 @@ class SyncPckgMgmt(object): from_pkg_path = os.path.join(self.obs_meta_path, tmp['branch_from'], tmp['obs_from'], tmp['pkgname']) pkg_path = os.path.join(self.obs_meta_path, tmp['branch_to'], tmp['obs_to'], tmp['pkgname']) pkg_service_path = os.path.join(pkg_path, "_service") - if tmp['branch_from'] == "master": - branch = "openEuler" - else: - branch = tmp['branch_from'] if not os.path.exists(pkg_path): os.makedirs(pkg_path) - 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) + if tmp['branch_from'] == "master" and tmp['pkgname'] not in self.obs_ignored_package: + self._write_service_file(pkg_path, tmp['pkgname'], tmp['branch_to']) + if os.path.exists(pkg_service_path): + log.info("add %s %s %s _service succeed!" % (tmp['branch_to'], tmp['obs_to'], tmp['pkgname'])) + else: + log.info("add %s %s %s _service failed!" % (tmp['branch_to'], tmp['obs_to'], tmp['pkgname'])) + else: + if tmp['branch_from'] == "master": + branch = "openEuler" + else: + branch = tmp['branch_from'] + if not os.path.exists(pkg_service_path): + cmd = "cp %s/_service %s/_service" % (from_pkg_path, pkg_path) if os.system(cmd) == 0: - log.info("add %s %s %s _service succeed!" % (tmp['branch_to'], tmp['obs_to'], tmp['pkgname'])) + 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: + log.info("add %s %s %s _service failed!" % (tmp['branch_to'], tmp['obs_to'], tmp['pkgname'])) else: - log.info("add %s %s %s _service failed!" % (tmp['branch_to'], tmp['obs_to'], tmp['pkgname'])) - else: - log.error("copy %s service file failed!" % tmp['pkgname']) + log.error("copy %s service file failed!" % tmp['pkgname']) def _add_prj_meta_pkgs_service(self, msg): for tmp in msg: -- Gitee