wangtao
/
training_project
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
183 Commits 16 Branches 0 Tags 0 B
Commit Graph

183 Commits

Author SHA1 Message Date
liqiankun 47503800fc 修改写测试用例的job的pipeline的bug 2017-06-23 21:15:53 +08:00
liqiankun 1fdfa739b0 修改写测试用例的job的pipeline的bug 2017-06-23 20:58:00 +08:00
liqiankun df6890ac55 修改申请发布时80错误：删除旧有测试用例时失败导致 2017-06-23 20:42:06 +08:00
liqiankun 533df36173 1.修改写测试用例策略。写前删除traingID对应的文件夹。2,。修改python实训pipeline的多写一个challengeStage 2017-06-23 17:23:04 +08:00
liqiankun 246227ae43 修改pipeline 2017-06-23 17:09:33 +08:00
liqiankun 9a59f87ac7 更改challengeStage 2017-06-23 15:41:28 +08:00
liqiankun 11dfa20306 add challengeStage in pipeline 2017-06-23 15:27:33 +08:00
liqiankun 6dc14ea6bc modift erros in pipeline 2017-06-23 14:06:40 +08:00
liqiankun 99e03ae357 修复pipeline中的错误 2017-06-23 13:56:02 +08:00
liqiankun 84aec996b6 解决冲突 2017-06-22 21:21:55 +08:00
liqiankun 67248d7dac 修改BuildJobForInstance函数里gameInfo未解码就开始使用的bug 2017-06-22 21:05:10 +08:00
ladventure b038444e4e 1.修复buildThread注入失败bug 2017-06-22 20:05:00 +08:00
ladventure 3adbe40e3d merge remote origin 2017-06-22 19:00:57 +08:00
liqiankun 1b3904a478 更改getNumber != -1的错误 2017-06-22 16:18:40 +08:00
ladventure 85e3c0b91e 1.修复判断上次构建bug 
2.添加静态常量替换code
 2017-06-22 10:37:50 +08:00
liqiankun e481cacbaf 增加gameInf的base64解码操作 2017-06-22 09:19:08 +08:00
ladventure 30c7064e2f 修复写测试用例时， 
1.监控job构建完成的bug，
2.获取最新构建bug
3.增加一个时间戳参数作为这次构建的唯一标识，并使用这个参数区分每一次构建
 2017-06-21 23:35:36 +08:00
ladventure 1813b5bc04 修改jenkins 测试版密码 2017-06-21 17:08:12 +08:00
ladventure e409139ae9 添加测试方法，测试GameController.publishGame 2017-06-21 17:02:15 +08:00
ladventure d44c136e80 修改发布实训： 
写测试用例后，不删除job，
每次创建job之前先查看是否存在，如果存在则更新，不存在则创建
Merge branch 'develop' of https://git.trustie.net/Hjqreturn/training_project into develop

# Conflicts:
#	jenkins-exec/doc/allclasses-frame.html
#	jenkins-exec/doc/allclasses-noframe.html
#	jenkins-exec/doc/com/educoder/jenkins/controller/GameController.html
#	jenkins-exec/doc/com/educoder/jenkins/controller/package-frame.html
#	jenkins-exec/doc/com/educoder/jenkins/controller/package-summary.html
#	jenkins-exec/doc/constant-values.html
#	jenkins-exec/doc/help-doc.html
#	jenkins-exec/doc/index-files/index-1.html
#	jenkins-exec/doc/index-files/index-2.html
#	jenkins-exec/doc/index-files/index-3.html
#	jenkins-exec/doc/index-files/index-4.html
#	jenkins-exec/doc/index-files/index-5.html
#	jenkins-exec/doc/index.html
#	jenkins-exec/doc/stylesheet.css
#	jenkins-exec/src/main/java/com/educoder/jenkins/controller/GameController.java
 2017-06-21 14:50:52 +08:00
ladventure 0e9c90f495 添加注释文档 
Signed-off-by: ladventure <dylan-lili@foxmail.com>
 2017-06-20 19:56:58 +08:00
liqiankun 12fb6f47c9 修改写入测试用例时的换行问题 2017-06-20 17:32:40 +08:00
liqiankun 27d4ae52b4 修改写测试用例时特殊字符的处理 2017-06-20 17:14:59 +08:00
liqiankun 4ba1d1fa15 测试版V1.0 2017-06-20 14:26:10 +08:00
liqiankun b72e7bd122 测试版V1.0 2017-06-20 14:10:49 +08:00
liqiankun 9df314cd86 测试版V1.0 2017-06-20 14:10:08 +08:00
liqiankun adc92485dc 解决冲突 2017-06-19 22:30:27 +08:00
liqiankun d93df0b378 本地代码 2017-06-19 22:24:51 +08:00
kevin 076f730ee6 添加log信息 2017-06-19 22:21:22 +08:00
liqiankun 46aee8b2fd 1.更改pipeline生成流程：（1）发布游戏时不再生成pipeline。（2）开启实训时生成初始pipeline,之后在每次评测时判断是否需要更新pipeline.(3)优化job运 行监控部分的代码。（4）更改写测试用例部分的代码：一次性写入全部测试用例并在写入之前先删除trainingID下所有的文件（删除失败则令job失败并输出错误信息）。并在写入失败时重复写几次，写完之后获取临时job的构建结果。 2017-06-19 15:57:31 +08:00
ladventure 5e536b05a3 merge 2017-06-17 14:11:10 +08:00
liqiankun 81c490e1ab Merge remote-tracking branch 'refs/remotes/origin/develop' into develop 2017-06-17 13:52:11 +08:00
liqiankun fafca786f6 更改脚本生成方式 2017-06-17 13:43:39 +08:00
ladventure e4a8765dd7 实现trustie前台不保存pipeline脚本，每次构建时候，添加标志，如果需要更新pipeline，则使用gameInfo参数生成pipeline脚本，然后更新job，构建，修改相关对外接口如下 
修改接口：

1.开启实训，修改本接口，不传递pipeline脚本，改为传递gameInfo信息，生成pipeline脚本，然后创建job，进行初始构建
public JSONObject openGameInstance(
	@ApiParam(name = "jobNameForInstance", required = true, value = "job名字") @RequestParam String jobNameForInstance,
	@ApiParam(name = "gameInfo", required = true, value = "游戏信息") @RequestParam String gameInfo,
	@ApiParam(name = "instanceGitURL", required = true, value = "job的gitUrl") @RequestParam String instanceGitURL) throws Exception

2.开始构建，修改本接口，当需要更新pipeline的时候，取gameInfo中的参数，生成新的pipeline，更新JOb，再构建, modifyStatus 标志是否更改，1表示需要更改，0 表示不需要更改
public JSONObject buildJobForInstance(
			@ApiParam(name = "jobNameForInstance", required = true, value = "job的名字") @RequestParam String jobNameForInstance,
			@ApiParam(name = "instanceGitURL", required = true, value = "学员对应当前实训版本库地址") @RequestParam String instanceGitURL,
			@ApiParam(name = "buildID", required = true, value = "本次评测ID") @RequestParam String buildID,
			@ApiParam(name = "instanceChallenge", required = true, value = "当前处在第几关") @RequestParam String instanceChallenge,
			@ApiParam(name = "resubmit", required = true, value = "是否是重复评测") @RequestParam String resubmit,
			@ApiParam(name = "gameInfo", required = true, value = "游戏信息") @RequestParam String gameInfo,
			@ApiParam(name = "modifyStatus", required = true, value = "gameInfo有效性标志") @RequestParam String modifyStatus) throws UnsupportedEncodingException
 2017-06-16 22:05:00 +08:00
liqiankun d608eb8b5d 更改pipeline初步代码 2017-06-16 21:29:23 +08:00
ladventure 85c5cac6ad 修复没有增加同步方法 2017-06-16 10:14:46 +08:00
roadfar 52ddbb50d9 123 2017-06-15 16:28:44 +08:00
roadfar 54abd65a93 123 2017-06-15 16:20:55 +08:00
roadfar b6d4eb264e 123 2017-06-15 16:17:36 +08:00
roadfar aa911162e7 123 2017-06-15 16:15:07 +08:00
roadfar 782ca95982 123 2017-06-15 16:12:38 +08:00
roadfar 4f9434234e 123 2017-06-15 16:09:47 +08:00
roadfar a65de2915f 123 2017-06-15 16:07:34 +08:00
roadfar 042c69945a 123 2017-06-15 16:02:29 +08:00
ladventure ff4a7deacf test web hook 2017-06-15 11:00:33 +08:00
liqiankun b1e4f29441 1.修复中间层获取不到job状态时无法退出的情况。2.优化buildTheread的程序结构 2017-06-14 22:34:52 +08:00
liqiankun 1d2315c457 1.修复中间层获取不到job状态时无法退出的情况。2.优化buildTheread的程序结构 2017-06-14 22:27:29 +08:00
ladventure cd8cea9909 修复buildBlockingQueue空指针异常 2017-06-14 15:51:42 +08:00
ladventure e88468feb6 修复getWaitingTime buildID不存在错误 
增加同步处理
 2017-06-14 15:39:45 +08:00
liqiankun 31c6cf9bdf 修复查询构建状态失败时无法退出的错误 2017-06-14 09:54:53 +08:00