Commit Graph

183 Commits

Author SHA1 Message Date
liqiankun 32f6b303cd 解决冲突 2017-06-13 20:18:15 +08:00
liqiankun 6a5729b6c7 本地修改 2017-06-13 20:12:51 +08:00
ladventure 95fb2926e1 合并冲突 2017-06-13 20:10:03 +08:00
ladventure 602cbe26d2 增加获取等待时间方法 2017-06-13 20:00:53 +08:00
ladventure 59539bbd35 修改正式版测试 2017-06-13 10:48:23 +08:00
ladventure c129ebfd2d 修改正式版测试 2017-06-13 10:47:14 +08:00
ladventure ca7a0a099c 修改正式版测试 2017-06-13 10:36:21 +08:00
ladventure faec099f39 修改正式版测试 2017-06-13 10:35:19 +08:00
ladventure 5f372c659e 过滤日志 2017-06-13 09:33:48 +08:00
ladventure 1f6ba815bd Merge branch 'develop' of https://git.trustie.net/Hjqreturn/training_project into develop 2017-06-13 09:29:39 +08:00
ladventure 1416409348 修改错误日志记录 2017-06-13 09:29:13 +08:00
liqiankun 4dc817dd5c 修正url 2017-06-13 09:25:12 +08:00
liqiankun fbc06d7a3f 修复正则匹配错误 2017-06-12 18:20:44 +08:00
ladventure 49cd78d6ca add test 2017-06-12 17:30:14 +08:00
liqiankun 26c36aef9e 将构建错误的job的各种信息输出至指定文件;将线程池大小写进配置文件; 2017-06-12 16:15:08 +08:00
liqiankun e1773ce88c 获取等待的job数量 2017-06-12 08:37:23 +08:00
liqiankun b847c81f54 buildThreadNew 2017-06-07 23:14:09 +08:00
liqiankun 15518aa831 完善job运行 2017-05-31 20:38:24 +08:00
liqiankun 2490e844e8 添加请求构建前判断job是否存在的操作 2017-05-27 17:50:46 +08:00
liqiankun a2635967bc 添加errModel 2017-05-27 16:46:25 +08:00
kevin dc55246617 job运行监控 2017-05-27 07:49:18 +08:00
liqiankun 7dfe3cc58d 将job监控独立成一个服务 2017-05-26 11:22:06 +08:00
liqiankun 00ece5f3ba 25日添加job运行情况监控 2017-05-25 22:48:57 +08:00
liqiankun ec70b9f819 设置GCC和java公用一个生成模板类 2017-05-25 12:34:45 +08:00
liqiankun 45af6156d5 添加mysql实训 2017-05-25 10:59:16 +08:00
ladventure f9f7139046 添加GCC配置 2017-05-25 09:12:14 +08:00
ladventure 385b025789 修改线程池大小 2017-05-23 15:49:26 +08:00
ladventure c22bf88be9 Merge branch 'develop' of https://git.trustie.net/Hjqreturn/training_project into develop 2017-05-23 15:48:30 +08:00
ladventure b83b56224e 1.修改mainContainer带有tag的错误
2.增加日志输出
3.修改日志配置文件,关闭httpclient日志debug模式变成info
2017-05-23 15:46:56 +08:00
liqiankun 5431fdd034 解决冲突 2017-05-23 13:01:30 +08:00
liqiankun a19a097cc0 将线程池大小写到配置文件,并给构建控制添加超时退出机制 2017-05-23 12:45:30 +08:00
liqiankun 3df483ecfc 将进程池大小写进配置文件,并在构建控制中添加线程超时退出 2017-05-23 12:31:35 +08:00
ladventure a2ae09b160 修改java执行命令 文件前有src 和挂载路径修改为/home/jenkins/workspace 2017-05-23 11:26:24 +08:00
ladventure ed0e6130ca 更改替换PODLABEL 2017-05-22 20:16:23 +08:00
liqiankun 99196bff2d merge develop 2017-05-22 17:09:35 +08:00
liqiankun 7bddbcd43a write poolsize in config file and add timeout for a job 2017-05-22 16:59:02 +08:00
ladventure 6e32bb1b21 增加jdbc pipeline 2017-05-22 16:47:19 +08:00
liqiankun 96f9fc02a4 解决冲突 2017-05-21 22:18:17 +08:00
liqiankun 59360e4f2d modified pipelien 2017-05-21 22:01:58 +08:00
ladventure 3a8834b4d8 merge master 2017-05-21 21:37:18 +08:00
ladventure 0e2d83b7db 重构pipeline生成部分代码 2017-05-21 21:31:00 +08:00
liqiankun 18770772e8 添加配置文件 2017-05-20 11:16:20 +08:00
liqiankun 23ae3730c4 添加kubernetes 2017-05-19 22:56:04 +08:00
liqiankun 12fd5714a9 修复添加python实训时影响到其他实训的错误 2017-05-19 22:26:16 +08:00
LiLi 6dfcf1d77a testCode 2017-05-19 21:29:04 +08:00
LiLi c59f4fb71d testCode 2017-05-19 21:27:13 +08:00
kevin 9d3c2f1656 增加pipeline 2017-05-19 08:51:53 +08:00
liqiankun c92318f09d c实现串行控制并添加了部分k8s脚本 2017-05-18 22:46:18 +08:00
LiLi c3a1500fbd ll 2017-05-18 16:21:41 +08:00
liqiankun ec5c57af46 串行控制 2017-05-18 16:20:23 +08:00