Commit 48e9dc8c authored by Wallen姚文辉's avatar Wallen姚文辉

脚本地址优化

parent 4ff37d09
...@@ -392,24 +392,14 @@ def jobreporterpath(name): ...@@ -392,24 +392,14 @@ def jobreporterpath(name):
@tool.route('/testport/runresult', methods=["GET"]) @tool.route('/testport/runresult', methods=["GET"])
def runresult(): def runresult():
reportMap={
"APP文案段主流程new":"APP文案流程接口",
"DWP各页面主流程接口":"DWP各页面主流程接口",
"smart-writing":"smart-writing接口",
"sop以及私域":"sop接口",
"全it":"全it",
"售前总流程ling":"售前Ling接口",
"售后主流程":"售后主流程接口",
"银河E签接口自动化":"银河E签接口自动化"
}
p = re.compile(r'echo total=(\d+)\s.+echo success=(\d+)\s.+echo fail=(\d+)', re.MULTILINE) p = re.compile(r'echo total=(\d+)\s.+echo success=(\d+)\s.+echo fail=(\d+)', re.MULTILINE)
data=server.auto_jenkins._get_view_jobs("全流程") data=server.auto_jenkins._get_view_jobs("全流程")
m=[] m=[]
# m=map(lambda x:{""})
for each in data: for each in data:
k={"job":each["name"]} k={"job":each["name"]}
number=server.auto_jenkins.get_job_info(each["name"]).get("builds")[0]["number"] number=server.auto_jenkins.get_job_info(each["name"]).get("builds")[0]["number"]
a=server.auto_jenkins.get_job_config(each["name"])
soup=BeautifulSoup(a,"xml")
info=server.auto_jenkins.get_build_info(each["name"],number) info=server.auto_jenkins.get_build_info(each["name"],number)
logs=server.auto_jenkins.get_build_console_output(each["name"],number) logs=server.auto_jenkins.get_build_console_output(each["name"],number)
res=p.findall(logs) res=p.findall(logs)
...@@ -418,7 +408,7 @@ def runresult(): ...@@ -418,7 +408,7 @@ def runresult():
k["success"]=res[0][1] k["success"]=res[0][1]
k["fail"]=res[0][2] k["fail"]=res[0][2]
k["running"],k['result'],k['time']=info["building"],info["result"],time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(float(info["timestamp"])/1000)) k["running"],k['result'],k['time']=info["building"],info["result"],time.strftime("%Y-%m-%d %H:%M:%S",time.localtime(float(info["timestamp"])/1000))
k["reportPath"]=server.auto_jenkins.server+'view/全流程/job/'+each["name"]+'/'+jobreporterpath(reportMap[each["name"]]) k["reportPath"]=server.auto_jenkins.server+'view/全流程/job/'+each["name"]+'/'+jobreporterpath(soup.find("reportName").text.replace('测试报告',""))
m.append(k) m.append(k)
return jsonify({"code": 200, "message": "请求成功","data":m}),200 return jsonify({"code": 200, "message": "请求成功","data":m}),200
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment