onedev/agent

■ ■ ■ ■ ■ ■

pom.xml

		skipped 9 lines
10	10		<version>1.0.5</version>
11	11		</parent>
12	12		<artifactId>agent</artifactId>
13		-	<version>1.1.1</version>
	13	+	<version>1.1.2</version>
14	14		<build>
15	15		<plugins>
16	16		<plugin>
		skipped 128 lines
145	145		</dependency>
146	146		</dependencies>
147	147		<properties>
148		-	<k8shelper.version>2.2.11</k8shelper.version>
	148	+	<k8shelper.version>2.2.12</k8shelper.version>
149	149		<jackson.version>2.12.1</jackson.version>
150	150		<jersey.version>2.26</jersey.version>
151	151		<bootstrap>true</bootstrap>
		skipped 4 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/agent/DockerExecutorUtils.java

		skipped 125 lines
126	126		each.get("userName"), each.get("password"), jobLogger);
127	127		}
128	128
129		-	String network = jobData.getExecutorName() + "-" + jobData.getProjectName() + "-"
	129	+	String network = jobData.getExecutorName() + "-" + jobData.getProjectId() + "-"
130	130		+ jobData.getBuildNumber() + "-" + jobData.getRetried();
131	131		jobLogger.log("Creating docker network '" + network + "'...");
132	132
		skipped 722 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/agent/job/DockerJobData.java

		skipped 17 lines
18	18
19	19		private final int retried;
20	20
21		-	public DockerJobData(String jobToken, String executorName, String projectName, String commitHash,
22		-	Long buildNumber, List<Action> actions, int retried, List<Map<String, Serializable>> services,
23		-	List<Map<String, String>> registryLogins, List<String> trustCertContent, String dockerOptions) {
24		-	super(jobToken, executorName, projectName, commitHash, buildNumber, actions, trustCertContent);
	21	+	public DockerJobData(String jobToken, String executorName, String projectPath, Long projectId,
	22	+	String commitHash, Long buildNumber, List<Action> actions, int retried,
	23	+	List<Map<String, Serializable>> services, List<Map<String, String>> registryLogins,
	24	+	List<String> trustCertContent, String dockerOptions) {
	25	+	super(jobToken, executorName, projectPath, projectId, commitHash, buildNumber,
	26	+	actions, trustCertContent);
25	27		this.services = services;
26	28		this.registryLogins = registryLogins;
27	29		this.dockerOptions = dockerOptions;
		skipped 21 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/agent/job/ShellJobData.java

		skipped 12 lines
13	13
14	14		private final String executorName;
15	15
16		-	private final String projectName;
	16	+	private final String projectPath;
	17	+
	18	+	private final Long projectId;
17	19
18	20		private final String commitHash;
19	21
		skipped 3 lines
23	25
24	26		private final List<String> trustCertContent;
25	27
26		-	public ShellJobData(String jobToken, String executorName, String projectName, String commitHash,
27		-	Long buildNumber, List<Action> actions, List<String> trustCertContent) {
	28	+	public ShellJobData(String jobToken, String executorName, String projectPath, Long projectId,
	29	+	String commitHash, Long buildNumber, List<Action> actions, List<String> trustCertContent) {
28	30		this.jobToken = jobToken;
29	31		this.executorName = executorName;
30		-	this.projectName = projectName;
	32	+	this.projectPath = projectPath;
	33	+	this.projectId = projectId;
31	34		this.commitHash = commitHash;
32	35		this.buildNumber = buildNumber;
33	36		this.actions = actions;
		skipped 8 lines
42	45		return executorName;
43	46		}
44	47
45		-	public String getProjectName() {
46		-	return projectName;
	48	+	public String getProjectPath() {
	49	+	return projectPath;
	50	+	}
	51	+
	52	+	public Long getProjectId() {
	53	+	return projectId;
47	54		}
48	55
49	56		public String getCommitHash() {
		skipped 17 lines