|
|
@@ -12,11 +12,13 @@ import nju.seec.SEECdemo.logic.service.impl.assignment.mock.MockQuestion;
|
|
|
import nju.seec.SEECdemo.logic.service.impl.assignment.stub.GroupServiceStub;
|
|
|
import nju.seec.SEECdemo.logic.service.impl.assignment.stub.QuestionServiceStub;
|
|
|
import nju.seec.SEECdemo.logic.storage.StorageProvider;
|
|
|
+import nju.seec.SEECdemo.logic.vo.ProjectVO;
|
|
|
import nju.seec.SEECdemo.util.ToolKit;
|
|
|
import nju.seec.SEECdemo.util.enums.AssignmentStatus;
|
|
|
import org.apache.commons.io.FileUtils;
|
|
|
import org.eclipse.jgit.api.errors.GitAPIException;
|
|
|
import org.gitlab4j.api.GitLabApiException;
|
|
|
+import org.gitlab4j.api.models.Project;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -104,11 +106,11 @@ public class AssignmentPaperBuilder {
|
|
|
jenkinsApi.createBuildJob(buildJob);
|
|
|
codeResult.setBuildJob(buildJob);
|
|
|
// 调用kube Api创建该项目的部署空间，并记录其id
|
|
|
- Long projectDeployNameSpace = projectService.createSeecIIProject(formProjectName(group.getId(), code.getId()),
|
|
|
+ ProjectVO projectVO = projectService.createSeecIIProject(formProjectName(group.getId(), code.getId()),
|
|
|
"", // 暂时留空
|
|
|
- Date.from(code.getStartAt().atZone(ZoneId.systemDefault()).toInstant()),
|
|
|
- Date.from(code.getEndAt().atZone(ZoneId.systemDefault()).toInstant()));
|
|
|
- codeResult.setDeployNamespace(projectDeployNameSpace);
|
|
|
+ code.getStartAt().toLocalDate(),
|
|
|
+ code.getEndAt().toLocalDate());
|
|
|
+ codeResult.setDeployNamespace(projectVO.getName());
|
|
|
// 创建jenkins上的测试job
|
|
|
String testJob = projectId + "-test";
|
|
|
jenkinsApi.createTestJob(testJob);
|
