From 0759f9d6f00e237429a10bea40d8f9662e07a5a3 Mon Sep 17 00:00:00 2001
From: tracedeng <56997132@qq.com>
Date: Tue, 12 Oct 2021 10:40:31 +0800
Subject: [PATCH] diable cpio bulk download temp

---
 src/build/osc_build_k8s.py |  3 ++-
 src/proxy/obs_proxy.py     | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/build/osc_build_k8s.py b/src/build/osc_build_k8s.py
index ae4a991..1e3e354 100755
--- a/src/build/osc_build_k8s.py
+++ b/src/build/osc_build_k8s.py
@@ -104,7 +104,8 @@ class SinglePackageBuild(object):
                 continue
             root_build = repo["mpac"] in self.PACKAGES_USE_ROOT
             if not OBSProxy.build_package(
-                    project, self._package, repo["repo"], self._arch, repo["mpac"], root_build=root_build):
+                    project, self._package, repo["repo"], self._arch, repo["mpac"], 
+                    root_build=root_build, disable_cpio=True):
                 logger.error("build {} ... failed".format(repo["repo"]))
                 return 3
 
diff --git a/src/proxy/obs_proxy.py b/src/proxy/obs_proxy.py
index cda15e7..6724748 100644
--- a/src/proxy/obs_proxy.py
+++ b/src/proxy/obs_proxy.py
@@ -115,7 +115,7 @@ class OBSProxy(object):
         return True
 
     @staticmethod
-    def build_package(project, package, repo, arch, mpac, debug=False, root_build=False):
+    def build_package(project, package, repo, arch, mpac, debug=False, root_build=False, disable_cpio=False):
         """
         build
         :param project:
@@ -129,11 +129,12 @@ class OBSProxy(object):
         package_path = "{}/{}".format(project, package)
         root_opt = "--userootforbuild" if root_build else ""
         debuginfo_opt = "--disable-debuginfo" if not debug else ""
-        cmd = "cd {}; osc build {} {} {} {} --no-verify --clean --noservice -M {}".format(
-            package_path, repo, arch, root_opt, debuginfo_opt, mpac)
+        disable_cpio_bulk = "--disable-cpio-bulk-download" if disable_cpio else ""
+        cmd = "cd {}; osc build {} {} {} {} {} --no-verify --clean --noservice -M {}".format(
+            package_path, repo, arch, root_opt, debuginfo_opt, disable_cpio_bulk, mpac)
 
-        logger.info("osc build {} {} {} {} --no-verify --clean --noservice -M {}".format(
-            repo, arch, root_opt, debuginfo_opt, mpac))
+        logger.info("osc build {} {} {} {} {} --no-verify --clean --noservice -M {}".format(
+            repo, arch, root_opt, debuginfo_opt, disable_cpio_bulk, mpac))
         ret, _, _ = shell_cmd_live(cmd, verbose=True)
 
         if ret:
-- 
Gitee