Commit Graph

15149 Commits

Author SHA1 Message Date
Captain.B 4cc73c172c Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-26 11:27:02 +08:00
shiziyuan9527 57113557bb 修改请求统计表格 2020-03-25 19:10:16 +08:00
Captain.B 564bab0097 registry 2020-03-25 17:14:31 +08:00
Captain.B d9a6cacc0f Merge remote-tracking branch 'origin/dev' into dev 2020-03-25 15:59:11 +08:00
Captain.B ec093c669f registry 2020-03-25 15:58:05 +08:00
shiziyuan9527 54b30d4215 请求统计表格添加合计行 2020-03-25 14:49:33 +08:00
chenjianxing d31382ec2a merge 2020-03-25 13:03:16 +08:00
chenjianxing 592790856f 添加测试用例模块树 2020-03-25 13:02:11 +08:00
Captain.B 7daaa7022c 配置资源池 2020-03-25 11:01:40 +08:00
Captain.B 115823f739 配置资源池 2020-03-25 10:51:41 +08:00
Captain.B a04c0fc078 调整 2020-03-25 10:17:06 +08:00
Captain.B bab322a8cb 启动测试 2020-03-25 10:05:32 +08:00
Captain.B e1a1175cc9 启动测试 2020-03-25 10:01:24 +08:00
Captain.B c4cfae5bae 按比率启动容器 2020-03-24 22:18:05 +08:00
Captain.B ac369fea63 关于并发数 2020-03-24 20:07:08 +08:00
Captain.B db211cb76b 关于并发数 2020-03-24 19:42:38 +08:00
Captain.B 9d10c1e037 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 17:12:32 +08:00
W23123 4cfd6b5aad 资源池 状态 用枚举表示 2020-03-24 17:12:15 +08:00
Captain.B 24321e01c1 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 17:07:28 +08:00
Captain.B b8fcee6a0c k8s 启动 jmeter 2020-03-24 17:05:59 +08:00
W23123 9d2e70bf0e 资源池 2020-03-24 16:55:39 +08:00
W23123 3a383bb546 资源池 修改 flyway 2020-03-24 16:54:32 +08:00
W23123 a72ba55141 Merge remote-tracking branch 'origin/dev' into dev 2020-03-24 16:14:42 +08:00
W23123 c208f0705a 资源池 2020-03-24 16:14:27 +08:00
shiziyuan9527 0e0980ee1f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-24 16:09:29 +08:00
shiziyuan9527 16f16ab89d 修改请求统计表格 2020-03-24 16:07:52 +08:00
W23123 9532e1adc0 资源池 2020-03-24 16:07:19 +08:00
W23123 5dff901211 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	backend/src/main/resources/generatorConfig.xml
2020-03-24 16:05:13 +08:00
W23123 0329313845 节点信息 存进 test_resource 表 2020-03-24 16:04:43 +08:00
shiziyuan9527 55d7a806fd 报告-请求统计表格 2020-03-24 14:37:30 +08:00
Captain.B 20099c351e Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 11:33:15 +08:00
Captain.B 6589326868 查询资源池 2020-03-24 11:33:07 +08:00
chenjianxing 6b8c059f99 merge 2020-03-24 10:48:02 +08:00
chenjianxing a9845bf8d4 添加用例跟踪相关 2020-03-24 10:35:07 +08:00
Captain.B fdb6d69050 engine 2020-03-23 18:58:14 +08:00
shiziyuan9527 e699eaf04d jtl test 2020-03-23 18:23:51 +08:00
shiziyuan9527 a06b77b38c jtl parse 2020-03-23 17:35:35 +08:00
Captain.B 17bf685d05 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 17:11:40 +08:00
Captain.B 8652b0566d 配置资源池 2020-03-23 17:11:07 +08:00
W23123 172688f3e1 资源池添加 loading 2020-03-23 17:08:27 +08:00
W23123 7a04d8f47a Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 16:39:24 +08:00
W23123 10b005ba0b 添加校验资源池 K8s 和 node 是否有效 2020-03-23 16:39:04 +08:00
Captain.B ca66c782d8 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-23 15:44:23 +08:00
Captain.B ffba30cf85 jmx 记录开始时间 2020-03-23 15:44:15 +08:00
W23123 a62eaa55e0 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 15:42:50 +08:00
W23123 52105972fb 资源池 完成 95% 和 修改label-position="right" 2020-03-23 15:41:23 +08:00
Captain.B 952eabf628 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 15:00:44 +08:00
Captain.B bbdb987b64 csv 解析 2020-03-23 15:00:27 +08:00
chenjianxing 41a712435b 去掉zalenium相关 2020-03-23 13:38:45 +08:00
Captain.B 34fe47c1bc Merge remote-tracking branch 'origin/dev' into dev 2020-03-20 17:16:07 +08:00