Skip to content

The Unified and Autonomous Development Platform

chore: Update submodule reference and refactor job execution logic

Robin Shen5ee1d9af3242
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
index f94fe6fa0b..fd6483e301 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
@@ -577,14 +577,6 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
JobVariableInterpolator interpolator = new JobVariableInterpolator(build, build.getParamCombination());
TaskLogger jobLogger = buildLogService.newLogger(build);
- String jobExecutorName = interpolator.interpolate(build.getJob().getJobExecutor());
- JobExecutor jobExecutor = interpolator.interpolateProperties(getJobExecutor(build, jobExecutorName, jobLogger));
- String sequentialGroup = interpolator.interpolate(build.getJob().getSequentialGroup());
- String sequentialKey;
- if (sequentialGroup != null)
- sequentialKey = jobExecutorName + ":" + sequentialGroup;
- else
- sequentialKey = null;
Long projectId = build.getProject().getId();
String projectPath = build.getProject().getPath();
String projectGitDir = projectService.getGitDir(build.getProject().getId()).getAbsolutePath();
@@ -600,10 +592,19 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
long timeout;
Job job;
+ JobExecutor jobExecutor;
+ String sequentialKey;
JobAuthorizationContext.push(build.getJobAuthorizationContext());
Build.push(build);
try {
job = build.getJob();
+ String jobExecutorName = interpolator.interpolate(job.getJobExecutor());
+ jobExecutor = interpolator.interpolateProperties(getJobExecutor(build, jobExecutorName, jobLogger));
+ String sequentialGroup = interpolator.interpolate(job.getSequentialGroup());
+ if (sequentialGroup != null)
+ sequentialKey = jobExecutorName + ":" + sequentialGroup;
+ else
+ sequentialKey = null;
for (Step step : job.getSteps()) {
step = interpolator.interpolateProperties(step);
diff --git a/server-core/src/main/java/io/onedev/server/userdata/ServerUserDataProvisioner.java b/server-core/src/main/java/io/onedev/server/userdata/ServerUserDataProvisioner.java
index 32f16b2756..99a7120903 100644
--- a/server-core/src/main/java/io/onedev/server/userdata/ServerUserDataProvisioner.java
+++ b/server-core/src/main/java/io/onedev/server/userdata/ServerUserDataProvisioner.java
@@ -55,10 +55,11 @@ public class ServerUserDataProvisioner extends UserDataProvisioner {
var pathIndex = entry.getValue();
if (initPaths.contains(path)) {
var targetPath = workspaceContainerPath + "/" + getSubPath(pathIndex);
+ var quotedPath = "'" + path.replace("'", "'\"'\"'") + "'";
initEntrypointArgs.append(" ; ");
initEntrypointArgs.append("if [ ! -e ").append(targetPath).append(" ]; then ");
- initEntrypointArgs.append("if [ -e '").append(path).append("' ]; then ");
- initEntrypointArgs.append("cp -a '").append(path).append("' ").append(targetPath);
+ initEntrypointArgs.append("if [ -e ").append(quotedPath).append(" ]; then ");
+ initEntrypointArgs.append("cp -a ").append(quotedPath).append(" ").append(targetPath);
initEntrypointArgs.append("; else mkdir -p ").append(targetPath).append("; fi; fi");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index 0111bb13cb..5efee0bf78 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -722,8 +722,13 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
var spec = workspace.getSpec();
if (spec == null)
return null;
- spec = new WorkspaceVariableInterpolator(workspace).interpolateProperties(spec);
- return discoverProvisioner(workspace, spec);
+ Workspace.push(workspace);
+ try {
+ spec = new WorkspaceVariableInterpolator(workspace).interpolateProperties(spec);
+ return discoverProvisioner(workspace, spec);
+ } finally {
+ Workspace.pop();
+ }
}
@Nullable
diff --git a/server-ee b/server-ee
index 6d61e4cf43..bdefa6e126 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 6d61e4cf435ad3123d156a80962234e2effb1d54
+Subproject commit bdefa6e126ab33966cc8350f1a0185c67978e625
diff --git a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java
index 0e8665b18a..295cc66383 100644
--- a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java
+++ b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerProvisioner.java
@@ -459,7 +459,7 @@ public class ServerDockerProvisioner extends WorkspaceProvisioner implements Doc
@Override
@Nullable
public FileData readFileData(String path) {
- return WorkspaceUtils.readFileData(workspaceDir, path);
+ return WorkspaceUtils.readFileData(newDocker(), containerName, containerWorkDirPath, path);
}
@Override