|
@@ -3,6 +3,7 @@ package com.zilliz.milvustest.service;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.zilliz.milvustest.util.HttpClientUtils;
|
|
|
+import com.zilliz.milvustest.util.PropertyFilesUtil;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.testng.ITestContext;
|
|
@@ -88,25 +89,33 @@ public class CustomerListener extends TestListenerAdapter {
|
|
|
logger.info("===================={}测试结束====================", iTestContext.getName());
|
|
|
endTime=System.currentTimeMillis();
|
|
|
// insert result into db
|
|
|
- float passRate= (float) (passCase*100 / totalCase);
|
|
|
+ double passRate= passCase*100.00 / totalCase;
|
|
|
DecimalFormat df=new DecimalFormat("0.00");
|
|
|
- long costTime= (endTime-startTime)/1000/60;
|
|
|
+ int costTime= (int) ((endTime-startTime)/1000/60);
|
|
|
+ String scenarioDesc=System.getProperty("ScenarioDesc") == null
|
|
|
+ ? PropertyFilesUtil.getRunValue("ScenarioDesc")
|
|
|
+ : System.getProperty("ScenarioDesc");
|
|
|
+ String BuildId=System.getProperty("BuildId") == null
|
|
|
+ ? PropertyFilesUtil.getRunValue("BuildId")
|
|
|
+ : System.getProperty("BuildId");
|
|
|
+ String jenkinsLink="https://qa-jenkins.milvus.io/job/Java-sdk-test-nightly/"+BuildId+"/";
|
|
|
+ String githubLink="https://github.com/milvus-io/milvus-sdk-java/actions/workflows/java_sdk_ci_test.yaml";
|
|
|
JSONObject request=new JSONObject();
|
|
|
request.put("Product","Milvus");
|
|
|
request.put("Category","Function");
|
|
|
request.put("Date", LocalDate.now().toString());
|
|
|
- request.put("ScenarioName","test scenario");
|
|
|
+ request.put("Scenario",scenarioDesc);
|
|
|
request.put("Branch","Master");
|
|
|
- request.put("ImageName","master-latest");
|
|
|
- request.put("SDK","python");
|
|
|
+ request.put("ImageName","2.2.0");
|
|
|
+ request.put("SDK","java");
|
|
|
request.put("MilvusMode","standalone");
|
|
|
- request.put("MqMode","pulsar");
|
|
|
- request.put("TestResult","PASS");
|
|
|
- request.put("PassRate", String.valueOf(passRate));
|
|
|
- request.put("RunningTime", String.valueOf(costTime));
|
|
|
- request.put("Link","Link Link");
|
|
|
- String s = HttpClientUtils.doPostJson("http://localhost:8081/results/insert",request.toJSONString());
|
|
|
- logger.info("insert result:"+s);
|
|
|
+ request.put("MqMode","kafka");
|
|
|
+ request.put("TestResult",passRate==100?"pass":"fail");
|
|
|
+ request.put("PassRate", passRate);
|
|
|
+ request.put("RunningTime", costTime);
|
|
|
+ request.put("Link",scenarioDesc.equalsIgnoreCase("CI")?githubLink:jenkinsLink);
|
|
|
+ String s = HttpClientUtils.doPostJson("http://qtp-server.zilliz.cc/results/insert",request.toJSONString());
|
|
|
+ logger.info("insert result:"+s);
|
|
|
|
|
|
|
|
|
}
|