From b7e7999ee3880821d8d4b0ac34ff15798d27995d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BC=AA=E5=BC=80=E6=B3=A2?= <miaokaibo@outlook.com>
Date: Fri, 11 Sep 2020 10:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!3=20:?=
 =?UTF-8?q?=20support=20openEuler:20.03:LTS:Next'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/build/osc_build_k8s.py    |  4 +---
 src/jobs/jenkins_job.py       | 25 +++++++------------------
 src/jobs/obs_meta_strategy.py |  2 +-
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/build/osc_build_k8s.py b/src/build/osc_build_k8s.py
index 6d8f929..3e389de 100755
--- a/src/build/osc_build_k8s.py
+++ b/src/build/osc_build_k8s.py
@@ -12,7 +12,6 @@ class SinglePackageBuild(object):
     GITEEBRANCHPROJECTMAPPING = {
         "master": ["bringInRely", "openEuler:Extras", "openEuler:Factory", "openEuler:Mainline"],
         "openEuler-20.03-LTS": ["openEuler:20.03:LTS"],
-        "openEuler-20.03-LTS-Next": ["openEuler:20.03:LTS:Next"],
         "openEuler-EPOL-LTS": ["bringInRely"],
         "openEuler-20.09": ["openEuler:20.09"],
         "mkopeneuler-20.03": ["openEuler:Extras"]
@@ -110,8 +109,7 @@ class SinglePackageBuild(object):
                 elif param.get("name") == "tar_scm":
                     param.text = "tar_local"
                 elif param.get("name") == "url":
-                    if "openEuler_kernel" in param.text or "LTS_kernel" in param.text \
-                            or "openEuler-20.09_kernel" in param.text:
+                    if "openEuler_kernel" in param.text or "LTS_kernel" in param.text or "openEuler-20.09_kernel" in param.text:
                         param.text = "{}/{}".format(code_path, "code")  # kernel special logical
                     else:
                         gitee_repo = param.text.split("/")[-1]
diff --git a/src/jobs/jenkins_job.py b/src/jobs/jenkins_job.py
index b3595da..5b87e9e 100755
--- a/src/jobs/jenkins_job.py
+++ b/src/jobs/jenkins_job.py
@@ -3,7 +3,7 @@ import gevent
 from gevent import monkey
 monkey.patch_all()
 
-import abc
+from abc import ABCMeta, abstractmethod
 import os
 import stat
 import logging.config
@@ -16,11 +16,7 @@ import argparse
 
 
 class JenkinsJobs(object):
-    """
-    handle jenkins job with batch
-    """
-
-    __metaclass__ = abc.ABCMeta
+    __metaclass__ = ABCMeta
 
     def __init__(self, template_job, jenkins_proxy):
         """
@@ -90,7 +86,7 @@ class JenkinsJobs(object):
 
         return {"job": job, "result": result}
 
-    @abc.abstractmethod
+    @abstractmethod
     def get_real_target_jobs(self, jobs):
         """
         实际要操作的任务
@@ -99,13 +95,8 @@ class JenkinsJobs(object):
         """
         return jobs
 
-    @abc.abstractmethod
+    @abstractmethod
     def update_config(self, job):
-        """
-        implement in subclass
-        :param job:
-        :return:
-        """
         raise NotImplementedError
 
 
@@ -278,7 +269,7 @@ if "__main__" == __name__:
     args.add_argument("-f", type=str, dest="community", default="src-openeuler", help="src-openeuler or openeuler")
 
     args.add_argument("-a", type=str, dest="action", help="create or update")
-    args.add_argument("-c", type=int, dest="concurrency", default=75, help="jobs send to jenkins server concurrency")
+    args.add_argument("-c", type=int, dest="concurrency", default=75, help="jobs that send to jenkins server concurrency")
     args.add_argument("-r", type=int, dest="retry", default=3, help="retry times")
     args.add_argument("-i", type=int, dest="interval", default=0, help="retry interval")
 
@@ -307,10 +298,8 @@ if "__main__" == __name__:
     jp_t = JenkinsProxy(args.target_job_base_url, args.jenkins_user, args.jenkins_api_token, args.jenkins_timeout)
 
     if args.community == "src-openeuler":
-        jenkins_jobs = SrcOpenEulerJenkinsJobs(
-                args.template_job, jp_m, args.mapping_info_file, args.exclusive_arch_file)
+        jenkins_jobs = SrcOpenEulerJenkinsJobs(args.template_job, jp_m, args.mapping_info_file, args.exclusive_arch_file)
     else:
         jenkins_jobs = OpenEulerJenkinsJobs(args.template_job, jp_m, args.mapping_info_file, args.exclusive_arch_file)
 
-    jenkins_jobs.run(
-            args.action, args.target_jobs, jp_t, concurrency=args.concurrency, retry=args.retry, interval=args.interval)
+    jenkins_jobs.run(args.action, args.target_jobs, jp_t, concurrency=args.concurrency, retry=args.retry, interval=args.interval)
diff --git a/src/jobs/obs_meta_strategy.py b/src/jobs/obs_meta_strategy.py
index 5dc61c9..75f20b1 100755
--- a/src/jobs/obs_meta_strategy.py
+++ b/src/jobs/obs_meta_strategy.py
@@ -65,7 +65,7 @@ class ObsMetaStrategy(object):
                         logger.debug("analysis {}".format(_service))
                         tree = ET.parse(_service)
                         elements = tree.findall(".//param[@name=\"url\"]")  # <param name=url>next/openEuler/zip</parm>
-                    except:
+                    except Exception:
                         logger.exception("invalid xml format, {}".format(_service))
                         continue
 
-- 
Gitee