The Unified and Autonomous Development Platform
Fix issue #923 - Multi level projects after import and 1dev upgrade are mingled
Robin Shen5f7b656e75c7
diff --git a/pom.xml b/pom.xmlindex 308d77a545..d85deb8e78 100644--- a/pom.xml+++ b/pom.xml@@ -589,7 +589,7 @@</repositories><properties><commons.version>2.2.10</commons.version>- <agent.version>1.4.0</agent.version>+ <agent.version>1.4.1</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.9</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex aea230a80d..5e62498a5f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -450,6 +450,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate JobExecution execute(Build build) {Long buildId = build.getId();+ String refName = build.getRefName();ObjectId commitId = ObjectId.fromString(build.getCommitHash());Long buildNumber = build.getNumber();String projectPath = build.getProject().getPath();@@ -542,8 +543,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizJobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());try {return new JobContext(executor, projectPath, projectId, buildNumber, projectGitDir,- actions, job.getCpuRequirement(), job.getMemoryRequirement(), commitId,- caches, retried.get(), services, jobLogger) {+ actions, job.getCpuRequirement(), job.getMemoryRequirement(), refName,+ commitId, caches, retried.get(), services, jobLogger) {@Overridepublic void notifyJobRunning(Long agentId) {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.javaindex 745cfe1092..ce68aa3816 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java@@ -36,6 +36,8 @@ public abstract class JobContext {private final int memoryRequirement;+ private final String refName;+private final ObjectId commitId;private final Collection<CacheSpec> cacheSpecs;@@ -52,8 +54,8 @@ public abstract class JobContext {public JobContext(JobExecutor jobExecutor, String projectPath, Long projectId, Long buildNumber,File projectGitDir, List<Action> actions, int cpuRequirement, int memoryRequirement,- ObjectId commitId, Collection<CacheSpec> caches, int retried, List<Service> services,- TaskLogger logger) {+ String refName, ObjectId commitId, Collection<CacheSpec> caches, int retried,+ List<Service> services, TaskLogger logger) {this.jobExecutor = jobExecutor;this.projectPath = projectPath;this.projectId = projectId;@@ -62,6 +64,7 @@ public abstract class JobContext {this.actions = actions;this.cpuRequirement = cpuRequirement;this.memoryRequirement = memoryRequirement;+ this.refName = refName;this.commitId = commitId;this.cacheSpecs = caches;this.retried = retried;@@ -93,6 +96,10 @@ public abstract class JobContext {return actions;}+ public String getRefName() {+ return refName;+ }+public ObjectId getCommitId() {return commitId;}diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex e1acf5e2c2..5df704354c 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4373,5 +4373,5 @@ public class DataMigrator {}}}-+}diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.javaindex 8dfb643b63..6cf36a798e 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java@@ -68,6 +68,7 @@ public class KubernetesResource {context.reportJobWorkspace(jobWorkspace);JobData jobData = new JobData(context.getJobExecutor().getName(),+ context.getRefName(),context.getCommitId().name(),context.getActions());return SerializationUtils.serialize(jobData);diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.javaindex 68048d4904..f330a1e636 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java@@ -88,9 +88,9 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {List<String> trustCertContent = getTrustCertContent();DockerJobData jobData = new DockerJobData(jobToken, getName(), jobContext.getProjectPath(),- jobContext.getProjectId(), jobContext.getCommitId().name(), jobContext.getBuildNumber(),- jobContext.getActions(), jobContext.getRetried(), services, registryLogins,- mountDockerSock, trustCertContent, getRunOptions());+ jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),+ jobContext.getBuildNumber(), jobContext.getActions(), jobContext.getRetried(),+ services, registryLogins, mountDockerSock, trustCertContent, getRunOptions());try {WebsocketUtils.call(agentSession, jobData, 0);diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.javaindex f68a2c67ca..d600204286 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java@@ -75,8 +75,8 @@ public class RemoteShellExecutor extends ServerShellExecutor {List<String> trustCertContent = getTrustCertContent();ShellJobData jobData = new ShellJobData(jobToken, getName(), jobContext.getProjectPath(),- jobContext.getProjectId(), jobContext.getCommitId().name(), jobContext.getBuildNumber(),- jobContext.getActions(), trustCertContent);+ jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),+ jobContext.getBuildNumber(), jobContext.getActions(), trustCertContent);try {WebsocketUtils.call(agentSession, jobData, 0);diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 11cb9bac2f..d82cebf202 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -375,7 +375,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaint cloneDepth = checkoutFacade.getCloneDepth();cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),- cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),+ cloneInfo.getCloneUrl(), jobContext.getRefName(), jobContext.getCommitId().name(),checkoutFacade.isWithLfs(), checkoutFacade.isWithSubmodules(),cloneDepth, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));} finally {diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex 8474bd8d11..6f6291f748 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -199,7 +199,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatint cloneDepth = checkoutFacade.getCloneDepth();cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),- cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),+ cloneInfo.getCloneUrl(), jobContext.getRefName(), jobContext.getCommitId().name(),checkoutFacade.isWithLfs(), checkoutFacade.isWithSubmodules(),cloneDepth, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));} catch (Exception e) {