Skip to content

The Unified and Autonomous Development Platform

Job service implementation

Robin Shenc8b9d3078bf6
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index b7f5c5f609..94ea352e39 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -169,6 +169,7 @@ import io.onedev.server.migration.JpaConverter;
import io.onedev.server.migration.PersistentBagConverter;
import io.onedev.server.model.support.AutoDiscoveredJobExecutor;
import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.notification.CodeCommentNotificationManager;
import io.onedev.server.notification.CommitNotificationManager;
import io.onedev.server.notification.DefaultMailManager;
@@ -391,7 +392,7 @@ public class CoreModule extends AbstractPluginModule {
@Override
public Class<?> getAbstractClass() {
- return AutoDiscoveredJobExecutor.class;
+ return JobExecutor.class;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
index ba664ba036..8b09156d39 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
@@ -34,9 +34,7 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.CharMatcher;
import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
import com.google.common.collect.Sets;
@@ -73,8 +71,8 @@ import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.JobExecutor;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -249,11 +247,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);
Job job = build.getJob();
ObjectId commitId = ObjectId.fromString(build.getCommitHash());
- JobExecutor executor = getJobExecutor(build.getProject(), commitId, job.getName(), job.getEnvironment());
+ JobExecutor executor = getJobExecutor(build.getProject(), commitId, job.getName(), job.getImage());
if (executor != null) {
JobLogger logger = logManager.getLogger(build, jobSecretsToMask);
Long buildId = build.getId();
+ Long buildNumber = build.getNumber();
String projectName = build.getProject().getName();
File projectGitDir = build.getProject().getGitDir();
JobExecution execution = new JobExecution(executorService.submit(new Runnable() {
@@ -291,13 +290,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
for (String value: paramValues) {
if (paramType.equals(InputSpec.SECRET))
value = build.getSecretValue(value);
- envVars.put(paramName + "_" + index++, value);
+ envVars.put("BUILD_PARAM_" + paramName.toUpperCase() + "_" + index++, value);
}
} else if (paramValues.size() == 1) {
String value = paramValues.iterator().next();
if (paramType.equals(InputSpec.SECRET))
value = build.getSecretValue(value);
- envVars.put(paramName, value);
+ envVars.put("BUILD_PARAM_" + paramName.toUpperCase(), value);
}
}
}
@@ -311,8 +310,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
});
- List<String> commands = Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(job.getCommands());
-
List<SubmoduleCredential> submoduleCredentials = new ArrayList<>();
if (job.isRetrieveSource()) {
for (SubmoduleCredential submoduleCredential: job.getSubmoduleCredentials()) {
@@ -323,9 +320,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
submoduleCredentials.add(resolvedSubmoduleCredential);
}
}
- JobContext jobContext = new JobContext(projectName, projectGitDir, job.getEnvironment(), serverWorkspace,
- envVars, commands, job.isRetrieveSource(), submoduleCredentials, commitId, job.getCaches(),
- new PatternSet(includeFiles, excludeFiles), executor.getCacheTTL(), logger) {
+ JobContext jobContext = new JobContext(projectName, buildNumber, projectGitDir, job.getImage(), serverWorkspace,
+ envVars, job.getCommands(), job.isRetrieveSource(), submoduleCredentials, job.getCpuRequirement(),
+ job.getMemoryRequirement(), commitId, job.getCaches(), new PatternSet(includeFiles, excludeFiles),
+ executor.getCacheTTL(), job.getServices(), logger) {
@Override
public void notifyJobRunning() {
@@ -346,13 +344,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
};
jobContexts.put(jobToken, jobContext);
+ executor.execute(jobToken, jobContext);
+ } catch (Exception e) {
+ handleException(e, jobSecretsToMask, logger);
+ } finally {
+ jobContexts.remove(jobToken);
try {
- executor.execute(jobToken, jobContext);
- } finally {
- jobContexts.remove(jobToken);
-
sessionManager.run(new Runnable() {
-
+
@Override
public void run() {
logger.log("Processing job outcomes...");
@@ -362,24 +361,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
});
+ FileUtils.deleteDir(serverWorkspace);
+ } catch (Exception e) {
+ handleException(e, jobSecretsToMask, logger);
}
- } catch (Exception e) {
- if (ExceptionUtils.find(e, InterruptedException.class) == null) {
- if (e.getMessage() != null)
- logger.log(e.getMessage());
- else
- logger.log(Throwables.getStackTraceAsString(e));
- }
- String errorMessage = e.getMessage();
- if (errorMessage != null) {
- for (String secret: jobSecretsToMask)
- errorMessage = StringUtils.replace(errorMessage, secret, SecretInput.MASK);
- throw new RuntimeException(errorMessage);
- } else {
- throw e;
- }
- } finally {
- FileUtils.deleteDir(serverWorkspace);
logger.log("Job finished");
}
}
@@ -398,6 +383,23 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
+ private void handleException(Exception e, Collection<String> jobSecretsToMask, JobLogger logger) {
+ if (ExceptionUtils.find(e, InterruptedException.class) == null) {
+ if (e.getMessage() != null)
+ logger.log(e.getMessage());
+ else
+ logger.log(Throwables.getStackTraceAsString(e));
+ }
+ String errorMessage = e.getMessage();
+ if (errorMessage != null) {
+ for (String secret: jobSecretsToMask)
+ errorMessage = StringUtils.replace(errorMessage, secret, SecretInput.MASK);
+ throw new RuntimeException(errorMessage);
+ } else {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
@Override
public JobContext getJobContext(String jobToken, boolean mustExist) {
JobContext jobContext = jobContexts.get(jobToken);
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.java
index 982e0f60c5..be00403533 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java
@@ -15,6 +15,7 @@ import java.util.Map;
import java.util.Set;
import javax.validation.ConstraintValidatorContext;
+import javax.validation.constraints.Size;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
@@ -45,9 +46,9 @@ public class Job implements Serializable, Validatable {
private List<InputSpec> paramSpecs = new ArrayList<>();
- private String environment;
+ private String image;
- private String commands;
+ private List<String> commands;
private boolean retrieveSource = true;
@@ -59,7 +60,13 @@ public class Job implements Serializable, Validatable {
private List<JobTrigger> triggers = new ArrayList<>();
+ private List<JobService> services = new ArrayList<>();
+
private List<CacheSpec> caches = new ArrayList<>();
+
+ private String cpuRequirement = "500m";
+
+ private String memoryRequirement = "128m";
private long timeout = 3600;
@@ -75,7 +82,30 @@ public class Job implements Serializable, Validatable {
this.name = name;
}
- @Editable(order=105, name="Parameter Specs", description="Define parameter specifications of the job")
+ @Editable(order=110, description="Specify docker image of the job")
+ @NotEmpty
+ public String getImage() {
+ return image;
+ }
+
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+ @Editable(order=120, description="Specify commands to execute in above image, with one command per line. "
+ + "For Windows based images, commands will be interpretated by cmd.exe, and for Unix/Linux "
+ + "based images, commands will be interpretated by shell")
+ @Script(Script.SHELL)
+ @Size(min=1, message="may not be empty")
+ public List<String> getCommands() {
+ return commands;
+ }
+
+ public void setCommands(List<String> commands) {
+ this.commands = commands;
+ }
+
+ @Editable(order=130, name="Parameter Specs", description="Define parameter specifications of the job")
public List<InputSpec> getParamSpecs() {
return paramSpecs;
}
@@ -84,32 +114,35 @@ public class Job implements Serializable, Validatable {
this.paramSpecs = paramSpecs;
}
- @Editable(order=110, description="Specify the environment to run the command. Environment will be interpretated "
- + "by underlying job executor. For instance, a docker executor will treat it as a docker image, and an "
- + "agent executor will treat it as labels to match agents")
- @NotEmpty
- public String getEnvironment() {
- return environment;
+ @Editable(name="Dependency Jobs", order=140, description="Job dependencies determines the order and "
+ + "concurrency when run different jobs")
+ public List<JobDependency> getDependencies() {
+ return dependencies;
}
- public void setEnvironment(String environment) {
- this.environment = environment;
+ public void setDependencies(List<JobDependency> dependencies) {
+ this.dependencies = dependencies;
}
- @Editable(order=120, description="Specify commands to execute in above environment, with one command per line. "
- + "For Windows based environments, commands will be interpretated by cmd.exe, and for Unix/Linux "
- + "based environments, commands will be interpretated by shell")
- @Script(Script.SHELL)
- @NotEmpty
- public String getCommands() {
- return commands;
+ @Editable(order=200, description="Specify job outcomes")
+ public List<JobOutcome> getOutcomes() {
+ return outcomes;
}
- public void setCommands(String commands) {
- this.commands = commands;
+ public void setOutcomes(List<JobOutcome> outcomes) {
+ this.outcomes = outcomes;
}
-
- @Editable(order=130, description="Check this to retrieve files stored in the repository into job workspace")
+
+ @Editable(order=500, description="Use triggers to run the job automatically under certain conditions")
+ public List<JobTrigger> getTriggers() {
+ return triggers;
+ }
+
+ public void setTriggers(List<JobTrigger> triggers) {
+ this.triggers = triggers;
+ }
+
+ @Editable(order=9000, group="Source Retrieval", description="Check this to retrieve files stored in the repository into job workspace")
public boolean isRetrieveSource() {
return retrieveSource;
}
@@ -118,7 +151,7 @@ public class Job implements Serializable, Validatable {
this.retrieveSource = retrieveSource;
}
- @Editable(order=135, description="For git submodules accessing via http/https, you will "
+ @Editable(order=9100, group="Source Retrieval", description="For git submodules accessing via http/https, you will "
+ "need to specify credentials here if required")
@ShowCondition("isSubmoduleCredentialsVisible")
public List<SubmoduleCredential> getSubmoduleCredentials() {
@@ -134,32 +167,35 @@ public class Job implements Serializable, Validatable {
return (boolean) OneContext.get().getEditContext().getInputValue("retrieveSource");
}
- @Editable(name="Dependency Jobs", order=140, description="Job dependencies determines the order and "
- + "concurrency when run different jobs")
- public List<JobDependency> getDependencies() {
- return dependencies;
+ @Editable(order=9200, name="CPU Requirement", group="Resource Requirements", description="Specify CPU requirement of the job. "
+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")
+ @NotEmpty
+ public String getCpuRequirement() {
+ return cpuRequirement;
}
- public void setDependencies(List<JobDependency> dependencies) {
- this.dependencies = dependencies;
+ public void setCpuRequirement(String cpuRequirement) {
+ this.cpuRequirement = cpuRequirement;
}
- @Editable(order=200, description="Specify job outcomes")
- public List<JobOutcome> getOutcomes() {
- return outcomes;
+ @Editable(order=9300, group="Resource Requirements", description="Specify memory requirement of the job. "
+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")
+ @NotEmpty
+ public String getMemoryRequirement() {
+ return memoryRequirement;
}
- public void setOutcomes(List<JobOutcome> outcomes) {
- this.outcomes = outcomes;
+ public void setMemoryRequirement(String memoryRequirement) {
+ this.memoryRequirement = memoryRequirement;
}
- @Editable(order=500, description="Use triggers to run the job automatically under certain conditions")
- public List<JobTrigger> getTriggers() {
- return triggers;
+ @Editable(order=10000, group="More Settings", description="Optionally define services used by this job")
+ public List<JobService> getServices() {
+ return services;
}
- public void setTriggers(List<JobTrigger> triggers) {
- this.triggers = triggers;
+ public void setServices(List<JobService> services) {
+ this.services = services;
}
@Editable(order=10100, group="More Settings", description="Cache specific paths to speed up job execution. For instance for node.js "
@@ -174,7 +210,7 @@ public class Job implements Serializable, Validatable {
this.caches = caches;
}
- @Editable(order=10200, group="More Settings", description="Specify timeout in seconds")
+ @Editable(order=10500, group="More Settings", description="Specify timeout in seconds")
public long getTimeout() {
return timeout;
}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java b/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java
index 8dd0bd2f34..032bf764c6 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java
@@ -16,9 +16,11 @@ public abstract class JobContext {
private final String projectName;
+ private final Long buildNumber;
+
private final File projectGitDir;
- private final String environment;
+ private final String image;
private final File serverWorkspace;
@@ -30,12 +32,18 @@ public abstract class JobContext {
private final List<SubmoduleCredential> submoduleCredentials;
+ private final String cpuRequirement;
+
+ private final String memoryRequirement;
+
private final ObjectId commitId;
private final Collection<CacheSpec> cacheSpecs;
private final PatternSet collectFiles;
+ private final List<JobService> services;
+
private final int cacheTTL;
private final JobLogger logger;
@@ -44,22 +52,28 @@ public abstract class JobContext {
private final Map<String, Integer> cacheCounts = new ConcurrentHashMap<>();
- public JobContext(String projectName, File projectGitDir, String environment,
- File workspace, Map<String, String> envVars, List<String> commands,
- boolean retrieveSource, List<SubmoduleCredential> submoduleCredentials, ObjectId commitId,
- Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL, JobLogger logger) {
+ public JobContext(String projectName, Long buildNumber, File projectGitDir, String image,
+ File workspace, Map<String, String> envVars, List<String> commands, boolean retrieveSource,
+ List<SubmoduleCredential> submoduleCredentials,
+ String cpuRequirement, String memoryRequirement, ObjectId commitId,
+ Collection<CacheSpec> caches, PatternSet collectFiles, int cacheTTL,
+ List<JobService> services, JobLogger logger) {
this.projectName = projectName;
+ this.buildNumber = buildNumber;
this.projectGitDir = projectGitDir;
- this.environment = environment;
+ this.image = image;
this.serverWorkspace = workspace;
this.envVars = envVars;
this.commands = commands;
this.retrieveSource = retrieveSource;
this.submoduleCredentials = submoduleCredentials;
+ this.cpuRequirement = cpuRequirement;
+ this.memoryRequirement = memoryRequirement;
this.commitId = commitId;
this.cacheSpecs = caches;
this.collectFiles = collectFiles;
this.cacheTTL = cacheTTL;
+ this.services = services;
this.logger = logger;
}
@@ -67,12 +81,16 @@ public abstract class JobContext {
return projectName;
}
+ public Long getBuildNumber() {
+ return buildNumber;
+ }
+
public File getProjectGitDir() {
return projectGitDir;
}
- public String getEnvironment() {
- return environment;
+ public String getImage() {
+ return image;
}
public File getServerWorkspace() {
@@ -99,6 +117,14 @@ public abstract class JobContext {
return submoduleCredentials;
}
+ public String getCpuRequirement() {
+ return cpuRequirement;
+ }
+
+ public String getMemoryRequirement() {
+ return memoryRequirement;
+ }
+
public Collection<CacheSpec> getCacheSpecs() {
return cacheSpecs;
}
@@ -119,6 +145,10 @@ public abstract class JobContext {
return allocatedCaches;
}
+ public List<JobService> getServices() {
+ return services;
+ }
+
public Map<String, Integer> getCacheCounts() {
return cacheCounts;
}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java b/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java
index 0c45aed93e..63a79dbbb2 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java
@@ -2,7 +2,7 @@ package io.onedev.server.ci.job;
import javax.annotation.Nullable;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
public interface JobExecutorDiscoverer {
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java b/server-core/src/main/java/io/onedev/server/ci/job/JobService.java
new file mode 100644
index 0000000000..24a3d0a5d4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobService.java
@@ -0,0 +1,106 @@
+package io.onedev.server.ci.job;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.util.validation.annotation.VariableName;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class JobService implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String image;
+
+ private String arguments;
+
+ private List<Variable> envVars = new ArrayList<>();
+
+ private String readinessCheckCommand;
+
+ private String cpuRequirement = "500m";
+
+ private String memoryRequirement = "128m";
+
+ @Editable(order=100, description="Specify name of the service, which can be used to access "
+ + "the service")
+ @VariableName
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200, description="Specify docker image of the service")
+ @NotEmpty
+ public String getImage() {
+ return image;
+ }
+
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+ @Editable(order=220, description="Optionally specify arguments to run above image")
+ public String getArguments() {
+ return arguments;
+ }
+
+ public void setArguments(String arguments) {
+ this.arguments = arguments;
+ }
+
+ @Editable(order=300, name="Environment Variables", description="Optionally specify environment variables of "
+ + "the service")
+ public List<Variable> getEnvVars() {
+ return envVars;
+ }
+
+ public void setEnvVars(List<Variable> envVars) {
+ this.envVars = envVars;
+ }
+
+ @Editable(order=400, description="Specify command to check readiness of the service. This command will "
+ + "be interpretated by cmd.exe on Windows images, and by shell on Linux images. It will be "
+ + "executed repeatedly until a zero code is returned, which means that service is ready")
+ @NotEmpty
+ public String getReadinessCheckCommand() {
+ return readinessCheckCommand;
+ }
+
+ public void setReadinessCheckCommand(String readinessCheckCommand) {
+ this.readinessCheckCommand = readinessCheckCommand;
+ }
+
+ @Editable(order=10000, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "
+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")
+ @NotEmpty
+ public String getCpuRequirement() {
+ return cpuRequirement;
+ }
+
+ public void setCpuRequirement(String cpuRequirement) {
+ this.cpuRequirement = cpuRequirement;
+ }
+
+ @Editable(order=10100, group="More Settings", description="Specify memory requirement of the job. "
+ + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")
+ @NotEmpty
+ public String getMemoryRequirement() {
+ return memoryRequirement;
+ }
+
+ public void setMemoryRequirement(String memoryRequirement) {
+ this.memoryRequirement = memoryRequirement;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Variable.java b/server-core/src/main/java/io/onedev/server/ci/job/Variable.java
new file mode 100644
index 0000000000..8b496852f6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ci/job/Variable.java
@@ -0,0 +1,40 @@
+package io.onedev.server.ci.job;
+
+import java.io.Serializable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.util.validation.annotation.VariableName;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class Variable implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String value;
+
+ @Editable(order=100)
+ @VariableName
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200)
+ @NotEmpty
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
index e8307e9f65..066ca57876 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java
@@ -6,11 +6,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.validation.constraints.Size;
+
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.hibernate.validator.constraints.NotEmpty;
import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Script;
@@ -24,16 +26,16 @@ public class ScriptingValues implements ValuesProvider {
public static final String SECRET_DISPLAY_NAME = "Evaluate script to get secrets";
- private String script;
+ private List<String> script;
@Editable
- @NotEmpty
@Script(Script.GROOVY)
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@@ -61,7 +63,7 @@ public class ScriptingValues implements ValuesProvider {
public List<List<String>> getValues() {
Map<String, Object> variables = new HashMap<>();
List<List<String>> values = new ArrayList<>();
- for (Object each: (List<Object>) GroovyUtils.evalScript(getScript(), variables)) {
+ for (Object each: (List<Object>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables)) {
List<String> strings = new ArrayList<>();
if (each instanceof Collection) {
strings.addAll((Collection<? extends String>) each);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index 7bf114930d..3f1db85f3d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -5,8 +5,8 @@ import java.util.List;
import javax.annotation.Nullable;
import io.onedev.server.model.Setting;
-import io.onedev.server.model.support.JobExecutor;
import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.model.support.setting.BackupSetting;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index e602563a5f..318384bc7f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -51,8 +51,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.model.support.JobExecutor;
import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index a62999563c..46c9cbab49 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -14,8 +14,8 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.maintenance.DataManager;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
-import io.onedev.server.model.support.JobExecutor;
import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.model.support.setting.BackupSetting;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
index 5f36c986f3..db528cc897 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
@@ -9,10 +9,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.ci.job.JobContext;
import io.onedev.server.ci.job.JobExecutorDiscoverer;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Horizontal;
@Editable(order=10000, description="Discover appropriate job executor automatically to run CI jobs")
+@Horizontal
public class AutoDiscoveredJobExecutor extends JobExecutor {
private static final long serialVersionUID = 1L;
@@ -39,8 +42,8 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {
jobExecutor.setBranches(getBranches());
jobExecutor.setCacheTTL(getCacheTTL());
jobExecutor.setEnabled(isEnabled());
- jobExecutor.setEnvironments(getEnvironments());
- jobExecutor.setJobs(getJobs());
+ jobExecutor.setJobEnvironments(getJobEnvironments());
+ jobExecutor.setJobNames(getJobNames());
jobExecutor.setProjects(getProjects());
jobExecutor.execute(jobToken, context);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/model/support/JobExecutor.java
rename to server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index e8ab358112..6599904ee4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support;
+package io.onedev.server.model.support.jobexecutor;
import java.io.Serializable;
@@ -29,9 +29,9 @@ public abstract class JobExecutor implements Serializable {
private String branches;
- private String jobs;
+ private String jobNames;
- private String environments;
+ private String jobEnvironments;
private int cacheTTL = 7;
@@ -45,7 +45,7 @@ public abstract class JobExecutor implements Serializable {
@Editable(order=10000, name="Applicable Projects", group="Job Applicability",
description="Optionally specify space-separated projects applicable for this executor. "
- + "Use * or ? for wildcard match")
+ + "Use * or ? for wildcard match. Leave empty to match all")
@ProjectPatterns
@NameOfEmptyValue("All")
public String getProjects() {
@@ -58,7 +58,7 @@ public abstract class JobExecutor implements Serializable {
@Editable(order=10100, name="Applicable Branches", group="Job Applicability",
description="Optionally specify space-separated branches applicable for this executor. "
- + "Use * or ? for wildcard match")
+ + "Use * or ? for wildcard match. Leave empty to match all")
@BranchPatterns
@NameOfEmptyValue("All")
public String getBranches() {
@@ -69,30 +69,30 @@ public abstract class JobExecutor implements Serializable {
this.branches = branches;
}
- @Editable(order=10200, name="Applicable Jobs", group="Job Applicability",
+ @Editable(order=10200, name="Applicable Job Names", group="Job Applicability",
description="Optionally specify space-separated jobs applicable for this executor. "
- + "Use * or ? for wildcard match")
+ + "Use * or ? for wildcard match. Leave empty to match all")
@Patterns
@NameOfEmptyValue("All")
- public String getJobs() {
- return jobs;
+ public String getJobNames() {
+ return jobNames;
}
- public void setJobs(String jobs) {
- this.jobs = jobs;
+ public void setJobNames(String jobNames) {
+ this.jobNames = jobNames;
}
- @Editable(order=10300, name="Applicable Environments", group="Job Applicability",
+ @Editable(order=10300, name="Applicable Job Environments", group="Job Applicability",
description="Optionally specify space-separated job environments applicable for this executor. "
- + "Use * or ? for wildcard match")
+ + "Use * or ? for wildcard match. Leave empty to match all")
@Patterns
@NameOfEmptyValue("All")
- public String getEnvironments() {
- return environments;
+ public String getJobEnvironments() {
+ return jobEnvironments;
}
- public void setEnvironments(String environments) {
- this.environments = environments;
+ public void setJobEnvironments(String jobEnvironments) {
+ this.jobEnvironments = jobEnvironments;
}
@Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. "
@@ -109,13 +109,13 @@ public abstract class JobExecutor implements Serializable {
public abstract void execute(String jobToken, JobContext context);
- public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String environment) {
+ public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String jobEnvironment) {
Matcher matcher = new ChildAwareMatcher();
return isEnabled()
&& (getProjects() == null || PatternSet.fromString(getProjects()).matches(matcher, project.getName()))
- && (getJobs() == null || PatternSet.fromString(getJobs()).matches(matcher, jobName))
- && (getEnvironments() == null || PatternSet.fromString(getEnvironments()).matches(matcher, environment))
+ && (getJobNames() == null || PatternSet.fromString(getJobNames()).matches(matcher, jobName))
+ && (getJobEnvironments() == null || PatternSet.fromString(getJobEnvironments()).matches(matcher, jobEnvironment))
&& (getBranches() == null || project.isCommitOnBranches(commitId, getBranches()));
}
@@ -139,5 +139,5 @@ public abstract class JobExecutor implements Serializable {
if (getProjects().length() == 0)
setProjects(null);
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/NodeSelectorEntry.java b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/NodeSelectorEntry.java
new file mode 100644
index 0000000000..a7b340050a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/NodeSelectorEntry.java
@@ -0,0 +1,38 @@
+package io.onedev.server.model.support.jobexecutor;
+
+import java.io.Serializable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class NodeSelectorEntry implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String labelName;
+
+ private String labelValue;
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getLabelName() {
+ return labelName;
+ }
+
+ public void setLabelName(String labelName) {
+ this.labelName = labelName;
+ }
+
+ @Editable(order=200)
+ @NotEmpty
+ public String getLabelValue() {
+ return labelValue;
+ }
+
+ public void setLabelValue(String labelValue) {
+ this.labelValue = labelValue;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java
new file mode 100644
index 0000000000..08aaa1c426
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java
@@ -0,0 +1,71 @@
+package io.onedev.server.model.support.jobexecutor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.Patterns;
+
+@Editable
+public class ServiceLocator implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String serviceNames;
+
+ private String serviceImages;
+
+ private List<NodeSelectorEntry> nodeSelector = new ArrayList<>();
+
+ @Editable(order=100, name="Applicable Names", description="Optionally specify space-separated "
+ + "service names applicable for this locator. Use * or ? for wildcard match. Leave empty to "
+ + "match all")
+ @Patterns
+ @NameOfEmptyValue("All")
+ public String getServiceNames() {
+ return serviceNames;
+ }
+
+ public void setServiceNames(String serviceNames) {
+ this.serviceNames = serviceNames;
+ }
+
+ @Editable(order=200, name="Applicable Images", description="Optionally specify space-separated "
+ + "service images applicable for this locator. Use * or ? for wildcard match. Leave "
+ + "empty to match all")
+ @Patterns
+ @NameOfEmptyValue("All")
+ public String getServiceImages() {
+ return serviceImages;
+ }
+
+ public void setServiceImages(String serviceImages) {
+ this.serviceImages = serviceImages;
+ }
+
+ @Editable(order=300, description="Specify node selector of this locator")
+ @Size(min=1, message="At least one entry should be specified")
+ public List<NodeSelectorEntry> getNodeSelector() {
+ return nodeSelector;
+ }
+
+ public void setNodeSelector(List<NodeSelectorEntry> nodeSelector) {
+ this.nodeSelector = nodeSelector;
+ }
+
+ public final boolean isApplicable(JobService service) {
+ Matcher matcher = new ChildAwareMatcher();
+
+ return (getServiceNames() == null || PatternSet.fromString(getServiceNames()).matches(matcher, service.getName()))
+ && (getServiceImages() == null || PatternSet.fromString(getServiceImages()).matches(matcher, service.getImage()));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
index 91aa78f5ed..d0e204c0e9 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,10 +1,12 @@
package io.onedev.server.util.inputspec.booleaninput.defaultvalueprovider;
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -13,25 +15,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return a <i>boolean</i> value. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public boolean getDefaultValue() {
- return (boolean) GroovyUtils.evalScript(getScript());
+ return (boolean) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
index 256056abcc..2a8f61dd5d 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
@@ -4,10 +4,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneException;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
@@ -21,20 +23,20 @@ public class ScriptingChoices extends ChoiceProvider {
private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. The return value should be a value to color map, "
+ "for instance:<br>"
+ "<code>return [\"Successful\":\"#00ff00\", \"Failed\":\"#ff0000\"]</code>, "
+ "Use <tt>null</tt> if the value does not have a color. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@@ -44,7 +46,7 @@ public class ScriptingChoices extends ChoiceProvider {
Map<String, Object> variables = new HashMap<>();
variables.put("allPossible", allPossible);
try {
- Object result = GroovyUtils.evalScript(getScript(), variables);
+ Object result = GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables);
if (result instanceof Map) {
return (Map<String, String>) result;
} else if (result instanceof List) {
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
index ae8d570acb..6a6208a3e2 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
@@ -2,11 +2,11 @@ package io.onedev.server.util.inputspec.choiceinput.defaultmultivalueprovider;
import java.util.List;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -15,26 +15,25 @@ public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return list of string. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@SuppressWarnings("unchecked")
@Override
public List<String> getDefaultValue() {
- return (List<String>) GroovyUtils.evalScript(getScript());
+ return (List<String>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 29813b25b4..803119bb1f 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,10 +1,12 @@
package io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider;
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -13,25 +15,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public String getDefaultValue() {
- return (String) GroovyUtils.evalScript(getScript());
+ return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
index 5bd2e66418..eccfe0a883 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,12 +1,13 @@
package io.onedev.server.util.inputspec.dateinput.defaultvalueprovider;
import java.util.Date;
+import java.util.List;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -15,25 +16,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return a <i>Date</i> value. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public Date getDefaultValue() {
- return (Date) GroovyUtils.evalScript(getScript());
+ return (Date) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
index c9bb64c381..51945343d2 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
@@ -5,14 +5,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -23,19 +24,18 @@ public class ScriptingChoices implements ChoiceProvider {
private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. The return value should be a list of group facade object to be used as choices. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@@ -45,7 +45,7 @@ public class ScriptingChoices implements ChoiceProvider {
Map<String, Object> variables = new HashMap<>();
variables.put("allPossible", allPossible);
try {
- return (List<GroupFacade>) GroovyUtils.evalScript(getScript(), variables);
+ return (List<GroupFacade>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables);
} catch (RuntimeException e) {
if (allPossible) {
logger.error("Error getting all possible choices", e);
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 6874d5729c..e69c0ba676 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,10 +1,12 @@
package io.onedev.server.util.inputspec.groupchoiceinput.defaultvalueprovider;
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -13,25 +15,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return name of a group. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public String getDefaultValue() {
- return (String) GroovyUtils.evalScript(getScript());
+ return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
index a499e075e4..ea6d1baedb 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,10 +1,12 @@
package io.onedev.server.util.inputspec.numberinput.defaultvalueprovider;
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -13,25 +15,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return a <i>Integer</i> value. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public int getDefaultValue() {
- return (int) GroovyUtils.evalScript(getScript());
+ return (int) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
index 219a8d0589..3b3bc77285 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,10 +1,12 @@
package io.onedev.server.util.inputspec.textinput.defaultvalueprovider;
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -13,25 +15,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public String getDefaultValue() {
- return (String) GroovyUtils.evalScript(getScript());
+ return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
index 0aae4fb5b6..8a7bc33f79 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
@@ -5,14 +5,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -23,19 +24,18 @@ public class ScriptingChoices implements ChoiceProvider {
private static final Logger logger = LoggerFactory.getLogger(ScriptingChoices.class);
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. The return value should be a list of user facade object to be used as choices. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@@ -45,7 +45,7 @@ public class ScriptingChoices implements ChoiceProvider {
Map<String, Object> variables = new HashMap<>();
variables.put("allPossible", allPossible);
try {
- return (List<UserFacade>) GroovyUtils.evalScript(getScript(), variables);
+ return (List<UserFacade>) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"), variables);
} catch (RuntimeException e) {
if (allPossible) {
logger.error("Error getting all possible choices", e);
diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index c8cb69608e..5003c06941 100644
--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,10 +1,12 @@
package io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider;
-import org.hibernate.validator.constraints.NotEmpty;
+import java.util.List;
+import javax.validation.constraints.Size;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.Script;
@@ -13,25 +15,24 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private static final long serialVersionUID = 1L;
- private String script;
+ private List<String> script;
@Editable(description="Groovy script to be evaluated. It should return login name of an user. "
+ "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")
- @NotEmpty
@Script(Script.GROOVY)
@OmitName
- @Multiline
- public String getScript() {
+ @Size(min=1, message="may not be empty")
+ public List<String> getScript() {
return script;
}
- public void setScript(String script) {
+ public void setScript(List<String> script) {
this.script = script;
}
@Override
public String getDefaultValue() {
- return (String) GroovyUtils.evalScript(getScript());
+ return (String) GroovyUtils.evalScript(StringUtils.join(getScript(), "\n"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
new file mode 100644
index 0000000000..da1a07fd76
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java
@@ -0,0 +1,31 @@
+package io.onedev.server.util.validation;
+
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.util.validation.annotation.DnsName;
+
+public class DnsNameValidator implements ConstraintValidator<DnsName, String> {
+
+ private static final Pattern PATTERN = Pattern.compile("[a-z0-9]([-a-z0-9]*[a-z0-9])?");
+
+ @Override
+ public void initialize(DnsName constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value != null && !PATTERN.matcher(value).matches()) {
+ String errorMessage = "can only contain alphanumberic characters or '-', and can only "
+ + "start and end with alphanumeric characters";
+ constraintContext.disableDefaultConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
new file mode 100644
index 0000000000..392883aa94
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java
@@ -0,0 +1,30 @@
+package io.onedev.server.util.validation;
+
+import javax.lang.model.SourceVersion;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.util.validation.annotation.VariableName;
+
+public class VariableNameValidator implements ConstraintValidator<VariableName, String> {
+
+ @Override
+ public void initialize(VariableName constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else if (!SourceVersion.isIdentifier(value) || value.contains("$")) {
+ constraintContext.disableDefaultConstraintViolation();
+ String errorMessage = "name should start with letter and can only consist of "
+ + "alphanumeric and underscore characters";
+ constraintContext.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.java
new file mode 100644
index 0000000000..3424ac8443
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/DnsName.java
@@ -0,0 +1,23 @@
+package io.onedev.server.util.validation.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.DnsNameValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=DnsNameValidator.class)
+public @interface DnsName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java
new file mode 100644
index 0000000000..4a5d56c16b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/VariableName.java
@@ -0,0 +1,23 @@
+package io.onedev.server.util.validation.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.VariableNameValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=VariableNameValidator.class)
+public @interface VariableName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
index 7f7e0de31a..2a79e8eb4b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html
@@ -27,7 +27,7 @@
</tbody>
<tfoot wicket:id="noElements">
<tr>
- <td wicket:id="td" class="no-elements">No elements defined</td>
+ <td wicket:id="td" class="no-elements"><div>No elements defined</div></td>
</tr>
</tfoot>
</table>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
index f217232e70..e229f09ea4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.html
@@ -15,7 +15,7 @@
<wicket:enclosure child="noElements">
<tfoot>
<tr>
- <td wicket:id="noElements" class="no-elements">No elements defined</td>
+ <td wicket:id="noElements" class="no-elements"><div>No elements defined</div></td>
</tr>
</tfoot>
</wicket:enclosure>
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index e1fe57ae51..d1fb324ef8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -68,7 +68,12 @@
.property-editor>.bean-list>table>*>tr>.actions {
font-size: 18px;
}
-
+.property-editor>.list>table>tfoot>tr>td.norecords-td>div,
+.property-editor>.bean-list>table>tfoot>tr>td.no-elements>div {
+ border-top: 2px solid #DDD;
+ margin-top: -6px;
+ padding: 8px 0 0 8px;
+}
.property-editor>.polymorphic-list>table>tbody>tr>td {
border-top: 2px solid #BBB;
padding-top: 20px;
@@ -83,6 +88,7 @@
.property-editor>.polymorphic-list>table>tbody>tr>td>.head>.actions a {
color: #666;
}
+
.property-viewer>.polymorphic-list>tbody>tr>td {
border-top: 2px solid #BBB;
padding-top: 12px;
@@ -91,6 +97,12 @@
.property-viewer>.polymorphic-list>tbody>tr>td>.type-selector {
margin-bottom: 12px;
}
+.property-viewer>.def-list>div>table>tfoot>tr>td.norecords-td>div,
+.property-viewer>.bean-list>tfoot>tr>td.no-elements>div {
+ border-top: 2px solid #DDD;
+ margin-top: -6px;
+ padding-top: 8px;
+}
.editable>.polymorphic>.type-selector {
margin-bottom: 15px;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.html
index 980905a507..3bbbf53a6b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.html
@@ -5,10 +5,8 @@
</div>
<table wicket:id="dependencies" class="table table-condensed table-hover"></table>
</div>
- <wicket:fragment wicket:id="jobColumnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java
index ae3fb1582a..20f3afb6f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/dependency/DependencyListEditPanel.java
@@ -128,8 +128,25 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- Fragment fragment = new Fragment(componentId, "jobColumnFrag", DependencyListEditPanel.this);
- ModalLink link = new ModalLink("link") {
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", DependencyListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
@Override
protected Component newContent(String id, ModalPanel modal) {
@@ -161,28 +178,7 @@ class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {
};
}
- };
- link.add(new Label("label", rowModel.getObject().getJobName()));
- fragment.add(link);
-
- cellItem.add(fragment);
- }
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("#Params")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getJobParams().size()));
- }
-
- });
-
- columns.add(new AbstractColumn<JobDependency, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobDependency>> cellItem, String componentId, IModel<JobDependency> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", DependencyListEditPanel.this);
+ });
fragment.add(new AjaxLink<Void>("delete") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.html
index 7da1dd5707..9f7cbf1cee 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.html
@@ -5,10 +5,8 @@
</div>
<table wicket:id="outcomes" class="table table-condensed table-hover"></table>
</div>
- <wicket:fragment wicket:id="typeColumnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java
index f30d6a410e..91314f9ba5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/outcome/OutcomeListEditPanel.java
@@ -97,8 +97,24 @@ class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<JobOutcome>> cellItem, String componentId, IModel<JobOutcome> rowModel) {
- Fragment fragment = new Fragment(componentId, "typeColumnFrag", OutcomeListEditPanel.this);
- ModalLink link = new ModalLink("link") {
+ cellItem.add(new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getClass())));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobOutcome, Void>(Model.of("File Patterns")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobOutcome>> cellItem, String componentId, IModel<JobOutcome> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getFilePatterns()));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobOutcome, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobOutcome>> cellItem, String componentId, IModel<JobOutcome> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", OutcomeListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
@Override
protected Component newContent(String id, ModalPanel modal) {
@@ -120,27 +136,7 @@ class OutcomeListEditPanel extends PropertyEditor<List<Serializable>> {
};
}
- };
- link.add(new Label("label", EditableUtils.getDisplayName(rowModel.getObject().getClass())));
- fragment.add(link);
-
- cellItem.add(fragment);
- }
- });
-
- columns.add(new AbstractColumn<JobOutcome, Void>(Model.of("File Patterns")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobOutcome>> cellItem, String componentId, IModel<JobOutcome> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getFilePatterns()));
- }
- });
-
- columns.add(new AbstractColumn<JobOutcome, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobOutcome>> cellItem, String componentId, IModel<JobOutcome> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", OutcomeListEditPanel.this);
+ });
fragment.add(new AjaxLink<Void>("delete") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java
index 2cca17d798..150b4ac54e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/param/ParamListEditPanel.java
@@ -348,7 +348,7 @@ class ParamListEditPanel extends PropertyEditor<List<Serializable>> {
Component valuesEditor = paramItem.get("values");
if (valuesEditor instanceof PropertyEditor) {
ScriptingValues scriptingValues = new ScriptingValues();
- scriptingValues.setScript((String) ((PropertyEditor<Serializable>) valuesEditor).getConvertedInput());
+ scriptingValues.setScript((List<String>) ((PropertyEditor<Serializable>) valuesEditor).getConvertedInput());
param.setValuesProvider(scriptingValues);
} else {
SpecifiedValues specifiedValues = new SpecifiedValues();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java
index 5d03ee6ccb..c8ae9ca4fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java
@@ -81,12 +81,12 @@ abstract class ParamSpecEditPanel extends Panel implements InputContext {
if (paramSpecIndex != -1) {
InputSpec oldParam = paramSpecs.get(paramSpecIndex);
if (!param.getName().equals(oldParam.getName()) && getInputSpec(param.getName()) != null) {
- editor.getErrorContext(new PathElement.Named("param"))
+ editor.getErrorContext(new PathElement.Named("paramSpec"))
.getErrorContext(new PathElement.Named("name"))
.addError("This name has already been used by another parameter");
}
} else if (getInputSpec(param.getName()) != null) {
- editor.getErrorContext(new PathElement.Named("param"))
+ editor.getErrorContext(new PathElement.Named("paramSpec"))
.getErrorContext(new PathElement.Named("name"))
.addError("This name has already been used by another parameter");
}
@@ -151,7 +151,7 @@ abstract class ParamSpecEditPanel extends Panel implements InputContext {
@Override
public void validateName(String inputName) {
- if (!SourceVersion.isIdentifier(inputName)) { // param name will be passed to build as environment variable name
+ if (!SourceVersion.isIdentifier(inputName) || inputName.contains("$")) {
throw new ValidationException("param name should start with letter and can only consist of "
+ "alphanumeric and underscore characters");
} else if (BuildConstants.ALL_FIELDS.contains(inputName)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
index dd58160720..d86e9bf1a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html
@@ -5,10 +5,8 @@
</div>
<table wicket:id="paramSpecs" class="table table-condensed table-hover"></table>
</div>
- <wicket:fragment wicket:id="nameColumnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
index cd19320409..004bec0547 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java
@@ -100,34 +100,7 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "nameColumnFrag", ParamSpecListEditPanel.this);
- ModalLink link = new ModalLink("link") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new ParamSpecEditPanel(id, params, cellItem.findParent(Item.class).getIndex()) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- markFormDirty(target);
- modal.close();
- onPropertyUpdating(target);
- target.add(ParamSpecListEditPanel.this);
- }
-
- };
- }
-
- };
- link.add(new Label("label", rowModel.getObject().getName()));
- fragment.add(link);
-
- cellItem.add(fragment);
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
}
});
@@ -153,6 +126,29 @@ class ParamSpecListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
Fragment fragment = new Fragment(componentId, "actionColumnFrag", ParamSpecListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new ParamSpecEditPanel(id, params, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(ParamSpecListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
fragment.add(new AjaxLink<Void>("delete") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceCssResourceReference.java
new file mode 100644
index 0000000000..bc388b3337
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.editable.job.service;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class ServiceCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ServiceCssResourceReference() {
+ super(ServiceCssResourceReference.class, "service.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html
new file mode 100644
index 0000000000..9d8a32af58
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.html
@@ -0,0 +1,18 @@
+<wicket:panel>
+ <form wicket:id="form" class="service-edit leave-confirm">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 id="modal-title" class="modal-title">
+ Service
+ </h4>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java
new file mode 100644
index 0000000000..0b8fff005f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java
@@ -0,0 +1,137 @@
+package io.onedev.server.web.editable.job.service;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.ci.CISpecAware;
+import io.onedev.server.ci.job.JobAware;
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PathElement;
+
+@SuppressWarnings("serial")
+abstract class ServiceEditPanel extends Panel implements CISpecAware, JobAware {
+
+ private final List<JobService> services;
+
+ private final int serviceIndex;
+
+ public ServiceEditPanel(String id, List<JobService> services, int serviceIndex) {
+ super(id);
+
+ this.services = services;
+ this.serviceIndex = serviceIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ JobService service;
+ if (serviceIndex != -1)
+ service = services.get(serviceIndex);
+ else
+ service = new JobService();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new NotificationPanel("feedback", form));
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ServiceEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", service);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (serviceIndex != -1) {
+ JobService oldService = services.get(serviceIndex);
+ if (!service.getName().equals(oldService.getName()) && getService(service.getName()) != null) {
+ editor.getErrorContext(new PathElement.Named("name"))
+ .addError("Service is already defined");
+ }
+ } else if (getService(service.getName()) != null) {
+ editor.getErrorContext(new PathElement.Named("name"))
+ .addError("Service is already defined");
+ }
+
+ if (!editor.hasErrors(true)) {
+ if (serviceIndex != -1) {
+ services.set(serviceIndex, service);
+ } else {
+ services.add(service);
+ }
+ onSave(target);
+ } else {
+ target.add(form);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ServiceEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ private JobService getService(String name) {
+ for (JobService service: services) {
+ if (name.equals(service.getName()))
+ return service;
+ }
+ return null;
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html
new file mode 100644
index 0000000000..2d77d73c8e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="service-list list">
+ <div class="head">
+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>
+ </div>
+ <table wicket:id="services" class="table table-condensed table-hover"></table>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java
new file mode 100644
index 0000000000..64b1a7878a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java
@@ -0,0 +1,266 @@
+package io.onedev.server.web.editable.job.service;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.CISpecAware;
+import io.onedev.server.ci.job.Job;
+import io.onedev.server.ci.job.JobAware;
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathElement;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+
+@SuppressWarnings("serial")
+class ServiceListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<JobService> services;
+
+ public ServiceListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ services = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ services.add((JobService) each);
+ }
+ }
+
+ private CISpec getCISpec() {
+ CISpecAware ciSpecAware = findParent(CISpecAware.class);
+ if (ciSpecAware != null)
+ return ciSpecAware.getCISpec();
+ else
+ return null;
+ }
+
+ private Job getJob() {
+ JobAware jobAware = findParent(JobAware.class);
+ if (jobAware != null)
+ return jobAware.getJob();
+ else
+ return null;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new ServiceEditPanel(id, services, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(ServiceListEditPanel.this);
+ }
+
+ @Override
+ public CISpec getCISpec() {
+ return ServiceListEditPanel.this.getCISpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return ServiceListEditPanel.this.getJob();
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<JobService, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("Environment")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getImage()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", ServiceListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new ServiceEditPanel(id, services, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(ServiceListEditPanel.this);
+ }
+
+ @Override
+ public CISpec getCISpec() {
+ return ServiceListEditPanel.this.getCISpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return ServiceListEditPanel.this.getJob();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ services.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(ServiceListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions";
+ }
+
+ });
+
+ IDataProvider<JobService> dataProvider = new ListDataProvider<JobService>() {
+
+ @Override
+ protected List<JobService> getData() {
+ return services;
+ }
+
+ };
+
+ DataTable<JobService, Void> dataTable;
+ add(dataTable = new DataTable<JobService, Void>("services", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(services, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(services, fromIndex-i, fromIndex-i-1);
+ }
+ onPropertyUpdating(target);
+ target.add(ServiceListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (JobService each: services)
+ value.add(each);
+ return value;
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathElement element) {
+ return null;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new ServiceCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java
new file mode 100644
index 0000000000..14dfaefde1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java
@@ -0,0 +1,59 @@
+package io.onedev.server.web.editable.job.service;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class ServiceListEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
+ if (elementClass == JobService.class) {
+ return new PropertyContext<List<Serializable>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ if (model.getObject() != null)
+ return new ServiceListViewPanel(id, model.getObject());
+ else
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
+ return new ServiceListEditPanel(componentId, descriptor, model);
+ }
+
+ };
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html
new file mode 100644
index 0000000000..b3b6b92097
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.html
@@ -0,0 +1,10 @@
+<wicket:panel>
+ <div class="def-list service-list">
+ <div class="body">
+ <table wicket:id="services" class="table table-condensed table-hover"></table>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="columnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java
new file mode 100644
index 0000000000..e27edbe452
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java
@@ -0,0 +1,176 @@
+package io.onedev.server.web.editable.job.service;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.layout.SideFloating;
+import io.onedev.server.web.page.layout.SideFloating.Placement;
+
+@SuppressWarnings("serial")
+class ServiceListViewPanel extends Panel {
+
+ private final List<JobService> services = new ArrayList<>();
+
+ public ServiceListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ services.add((JobService) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<JobService, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, rowModel.getObject().getName());
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("Environment")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, rowModel.getObject().getImage());
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<JobService, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobService>> cellItem, String componentId, IModel<JobService> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis";
+ }
+
+ });
+
+ IDataProvider<JobService> dataProvider = new ListDataProvider<JobService>() {
+
+ @Override
+ protected List<JobService> getData() {
+ return services;
+ }
+
+ };
+
+ add(new DataTable<JobService, Void>("services", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this));
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new ServiceCssResourceReference()));
+ }
+
+ private abstract class ColumnFragment extends Fragment {
+
+ private final int index;
+
+ public ColumnFragment(String id, int index) {
+ super(id, "columnFrag", ServiceListViewPanel.this);
+ this.index = index;
+ }
+
+ protected abstract Component newLabel(String componentId);
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new SideFloating(target, Placement.RIGHT) {
+
+ @Override
+ protected String getTitle() {
+ return services.get(index).getName();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "service def-detail"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, services.get(index), Sets.newHashSet("job"), true);
+ }
+
+ };
+ }
+
+ };
+ link.add(newLabel("label"));
+ add(link);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css b/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css
new file mode 100644
index 0000000000..11ace26c8e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/service.css
@@ -0,0 +1,3 @@
+.def-detail.service .editable>.bean-properties>table>tbody>tr>td.name {
+ min-width: 150px;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html
index 9e5b7e7c47..fc300befa8 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html
@@ -5,10 +5,8 @@
</div>
<table wicket:id="triggers" class="table table-condensed table-hover"></table>
</div>
- <wicket:fragment wicket:id="descriptionColumnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
- </wicket:fragment>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java
index 58e9d515a8..9c91d3a9ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java
@@ -113,8 +113,25 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
@Override
public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
- Fragment fragment = new Fragment(componentId, "descriptionColumnFrag", TriggerListEditPanel.this);
- ModalLink link = new ModalLink("link") {
+ cellItem.add(new Label(componentId, rowModel.getObject().getDescription()));
+ }
+ });
+
+ columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("#Params")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getParams().size()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", TriggerListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
@Override
protected Component newContent(String id, ModalPanel modal) {
@@ -141,28 +158,7 @@ class TriggerListEditPanel extends PropertyEditor<List<Serializable>> {
};
}
- };
- link.add(new Label("label", rowModel.getObject().getDescription()));
- fragment.add(link);
-
- cellItem.add(fragment);
- }
- });
-
- columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("#Params")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getParams().size()));
- }
-
- });
-
- columns.add(new AbstractColumn<JobTrigger, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<JobTrigger>> cellItem, String componentId, IModel<JobTrigger> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", TriggerListEditPanel.this);
+ });
fragment.add(new AjaxLink<Void>("delete") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java
index 052ebc4f9f..cdeea9baa4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptEditSupport.java
@@ -1,10 +1,12 @@
package io.onedev.server.web.editable.script;
+import java.util.List;
+
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.google.common.base.Preconditions;
-
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.server.OneException;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
@@ -21,32 +23,35 @@ public class ScriptEditSupport implements EditSupport {
Class<?> propertyClass = descriptor.getPropertyGetter().getReturnType();
Script annotation = descriptor.getPropertyGetter().getAnnotation(Script.class);
if (annotation != null) {
- Preconditions.checkState(propertyClass == String.class,
- "@Code annotation should only be applied to a string property");
- return new PropertyContext<String>(descriptor) {
-
- @Override
- public PropertyViewer renderForView(String componentId, final IModel<String> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null) {
- return new ScriptPropertyViewer(id, model.getObject(), annotation.value());
- } else {
- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ if (List.class.isAssignableFrom(propertyClass) && ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType()) == String.class) {
+ return new PropertyContext<List<String>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ List<String> script = model.getObject();
+ if (script != null && !script.isEmpty()) {
+ return new ScriptPropertyViewer(id, model.getObject(), annotation.value());
+ } else {
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
}
- }
-
- };
- }
-
- @Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new ScriptPropertyEditor(componentId, descriptor, model, annotation.value());
- }
-
- };
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {
+ return new ScriptPropertyEditor(componentId, descriptor, model, annotation.value());
+ }
+
+ };
+ } else {
+ throw new OneException("@Script annotation should only be applied to a string list property");
+ }
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java
index c2d8af0e8d..990c864645 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyEditor.java
@@ -1,5 +1,8 @@
package io.onedev.server.web.editable.script;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -10,6 +13,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathElement;
@@ -17,13 +24,13 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
-public class ScriptPropertyEditor extends PropertyEditor<String> {
+public class ScriptPropertyEditor extends PropertyEditor<List<String>> {
private final String modeName;
private TextArea<String> input;
- public ScriptPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel, String modeName) {
+ public ScriptPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel, String modeName) {
super(id, propertyDescriptor, propertyModel);
this.modeName = modeName;
}
@@ -35,7 +42,7 @@ public class ScriptPropertyEditor extends PropertyEditor<String> {
WebMarkupContainer container = new WebMarkupContainer("container");
add(container);
- container.add(input = new TextArea<String>("input", Model.of(getModelObject())));
+ container.add(input = new TextArea<String>("input", Model.of(StringUtils.join(getModelObject(), "\n"))));
input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
input.setOutputMarkupId(true);
@@ -55,8 +62,11 @@ public class ScriptPropertyEditor extends PropertyEditor<String> {
}
@Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
+ protected List<String> convertInputToValue() throws ConversionException {
+ List<String> convertedInput = new ArrayList<>();
+ if (input.getConvertedInput() != null)
+ convertedInput.addAll(Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(input.getConvertedInput()));
+ return convertedInput;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java
index 3b7bb67ad3..b5d3a0b5d5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/script/ScriptPropertyViewer.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.editable.script;
+import java.util.List;
+
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
@@ -7,16 +9,18 @@ import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
+import io.onedev.commons.utils.StringUtils;
+
@SuppressWarnings("serial")
public class ScriptPropertyViewer extends Panel {
- private final String script;
+ private final List<String> script;
private final String modeName;
private TextArea<String> input;
- public ScriptPropertyViewer(String id, String script, String modeName) {
+ public ScriptPropertyViewer(String id, List<String> script, String modeName) {
super(id);
this.modeName = modeName;
@@ -27,7 +31,7 @@ public class ScriptPropertyViewer extends Panel {
protected void onInitialize() {
super.onInitialize();
- input = new TextArea<>("input", Model.of(script));
+ input = new TextArea<>("input", Model.of(StringUtils.join(script, "\n")));
add(input);
input.setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.html
new file mode 100644
index 0000000000..eb94831db6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.html
@@ -0,0 +1,18 @@
+<wicket:panel>
+ <form wicket:id="form" class="locator-edit leave-confirm">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 id="modal-title" class="modal-title">
+ Service Locator
+ </h4>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java
new file mode 100644
index 0000000000..bb9e9ee55e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java
@@ -0,0 +1,113 @@
+package io.onedev.server.web.editable.servicelocator;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.ci.CISpecAware;
+import io.onedev.server.ci.job.JobAware;
+import io.onedev.server.model.support.jobexecutor.ServiceLocator;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+
+@SuppressWarnings("serial")
+abstract class LocatorEditPanel extends Panel implements CISpecAware, JobAware {
+
+ private final List<ServiceLocator> locators;
+
+ private final int locatorIndex;
+
+ public LocatorEditPanel(String id, List<ServiceLocator> locators, int locatorIndex) {
+ super(id);
+
+ this.locators = locators;
+ this.locatorIndex = locatorIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ ServiceLocator locator;
+ if (locatorIndex != -1)
+ locator = locators.get(locatorIndex);
+ else
+ locator = new ServiceLocator();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new NotificationPanel("feedback", form));
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(LocatorEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", locator);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (locatorIndex != -1) {
+ locators.set(locatorIndex, locator);
+ } else {
+ locators.add(locator);
+ }
+ onSave(target);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(LocatorEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
new file mode 100644
index 0000000000..55a271645f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="locator-list list">
+ <div class="head">
+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>
+ </div>
+ <table wicket:id="locators" class="table table-condensed table-hover"></table>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" title="Edit"><i class="fa fa-pencil"></i></a>
+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java
new file mode 100644
index 0000000000..8eb389eeac
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java
@@ -0,0 +1,284 @@
+package io.onedev.server.web.editable.servicelocator;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.CISpecAware;
+import io.onedev.server.ci.job.Job;
+import io.onedev.server.ci.job.JobAware;
+import io.onedev.server.model.support.jobexecutor.ServiceLocator;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathElement;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+
+@SuppressWarnings("serial")
+class LocatorListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<ServiceLocator> locators;
+
+ public LocatorListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ locators = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ locators.add((ServiceLocator) each);
+ }
+ }
+
+ private CISpec getCISpec() {
+ CISpecAware ciSpecAware = findParent(CISpecAware.class);
+ if (ciSpecAware != null)
+ return ciSpecAware.getCISpec();
+ else
+ return null;
+ }
+
+ private Job getJob() {
+ JobAware jobAware = findParent(JobAware.class);
+ if (jobAware != null)
+ return jobAware.getJob();
+ else
+ return null;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new LocatorEditPanel(id, locators, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(LocatorListEditPanel.this);
+ }
+
+ @Override
+ public CISpec getCISpec() {
+ return LocatorListEditPanel.this.getCISpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return LocatorListEditPanel.this.getJob();
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<ServiceLocator, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ cellItem.add(new Label(componentId, "<span class=\"drag-indicator fa fa-reorder\"></span>").setEscapeModelStrings(false));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("Applicable Names")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ if (rowModel.getObject().getServiceNames() != null) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getServiceNames()));
+ } else {
+ try {
+ cellItem.add(new EmptyValueLabel(componentId, ServiceLocator.class.getDeclaredMethod("getServiceNames")));
+ } catch (NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("Applicable Environments")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ if (rowModel.getObject().getServiceImages() != null) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getServiceImages()));
+ } else {
+ try {
+ cellItem.add(new EmptyValueLabel(componentId, ServiceLocator.class.getDeclaredMethod("getServiceEnvironments")));
+ } catch (NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("#Node Selector Entries")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getNodeSelector().size()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", LocatorListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new LocatorEditPanel(id, locators, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(LocatorListEditPanel.this);
+ }
+
+ @Override
+ public CISpec getCISpec() {
+ return LocatorListEditPanel.this.getCISpec();
+ }
+
+ @Override
+ public Job getJob() {
+ return LocatorListEditPanel.this.getJob();
+ }
+
+ };
+ }
+
+ });
+
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ locators.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(LocatorListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions";
+ }
+
+ });
+
+ IDataProvider<ServiceLocator> dataProvider = new ListDataProvider<ServiceLocator>() {
+
+ @Override
+ protected List<ServiceLocator> getData() {
+ return locators;
+ }
+
+ };
+
+ DataTable<ServiceLocator, Void> dataTable;
+ add(dataTable = new DataTable<ServiceLocator, Void>("locators", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(locators, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(locators, fromIndex-i, fromIndex-i-1);
+ }
+ onPropertyUpdating(target);
+ target.add(LocatorListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (ServiceLocator each: locators)
+ value.add(each);
+ return value;
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathElement element) {
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java
new file mode 100644
index 0000000000..ed4cc557cc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditSupport.java
@@ -0,0 +1,59 @@
+package io.onedev.server.web.editable.servicelocator;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.server.model.support.jobexecutor.ServiceLocator;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class LocatorListEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ Class<?> elementClass = ReflectionUtils.getCollectionElementType(descriptor.getPropertyGetter().getGenericReturnType());
+ if (elementClass == ServiceLocator.class) {
+ return new PropertyContext<List<Serializable>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ if (model.getObject() != null)
+ return new LocatorListViewPanel(id, model.getObject());
+ else
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
+ return new LocatorListEditPanel(componentId, descriptor, model);
+ }
+
+ };
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.html
new file mode 100644
index 0000000000..0339be2e0e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.html
@@ -0,0 +1,10 @@
+<wicket:panel>
+ <div class="def-list locator-list">
+ <div class="body">
+ <table wicket:id="locators" class="table table-condensed table-hover"></table>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="columnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java
new file mode 100644
index 0000000000..8a37232ae4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListViewPanel.java
@@ -0,0 +1,204 @@
+package io.onedev.server.web.editable.servicelocator;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.model.support.jobexecutor.ServiceLocator;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.page.layout.SideFloating;
+import io.onedev.server.web.page.layout.SideFloating.Placement;
+
+@SuppressWarnings("serial")
+class LocatorListViewPanel extends Panel {
+
+ private final List<ServiceLocator> locators = new ArrayList<>();
+
+ public LocatorListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ locators.add((ServiceLocator) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<ServiceLocator, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("Applicable Services")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ if (rowModel.getObject().getServiceNames() != null) {
+ return new Label("label", rowModel.getObject().getServiceNames());
+ } else {
+ try {
+ return new EmptyValueLabel("label", ServiceLocator.class.getDeclaredMethod("getServices"));
+ } catch (NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("Applicable Environments")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ if (rowModel.getObject().getServiceImages() != null) {
+ return new Label("label", rowModel.getObject().getServiceImages());
+ } else {
+ try {
+ return new EmptyValueLabel("label", ServiceLocator.class.getDeclaredMethod("getEnvironments"));
+ } catch (NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("#Node Selector Entries")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, rowModel.getObject().getNodeSelector().size());
+ }
+
+ });
+ }
+ });
+
+ columns.add(new AbstractColumn<ServiceLocator, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<ServiceLocator>> cellItem, String componentId, IModel<ServiceLocator> rowModel) {
+ if (!rowModel.getObject().getNodeSelector().isEmpty()) {
+ cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected Component newLabel(String componentId) {
+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);
+ }
+
+ });
+ } else {
+ cellItem.add(new Label(componentId));
+ }
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis";
+ }
+
+ });
+
+ IDataProvider<ServiceLocator> dataProvider = new ListDataProvider<ServiceLocator>() {
+
+ @Override
+ protected List<ServiceLocator> getData() {
+ return locators;
+ }
+
+ };
+
+ add(new DataTable<ServiceLocator, Void>("locators", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this));
+ }
+
+ });
+ }
+
+ private abstract class ColumnFragment extends Fragment {
+
+ private final int index;
+
+ public ColumnFragment(String id, int index) {
+ super(id, "columnFrag", LocatorListViewPanel.this);
+ this.index = index;
+ }
+
+ protected abstract Component newLabel(String componentId);
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new SideFloating(target, Placement.RIGHT) {
+
+ @Override
+ protected String getTitle() {
+ return "Service Locator";
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "locator def-detail"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, locators.get(index), Sets.newHashSet("job"), true);
+ }
+
+ };
+ }
+
+ };
+ link.add(newLabel("label"));
+ add(link);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
index a0bf7e2415..2b96f2b109 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
index 316b5b0b7e..f5b9514fbc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
@@ -15,7 +15,7 @@ import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.util.JobLogger;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.taskbutton.TaskButton;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
index c579e378ae..15a38a12bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
@@ -14,7 +14,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.page.admin.AdministrationPage;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
index 40c3a09895..b66fc572a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
@@ -15,7 +15,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.web.ajaxlistener.ConfirmListener;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 50993a6ae7..93250e2654 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -574,6 +574,7 @@ a.disabled, a[disabled="disabled"] {
.def-list table td.norecords-td {
padding: 5px;
}
+
.def-list table a {
display: block;
color: #666;
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 21d4e0eabf..6a31736e06 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -17,15 +17,15 @@
</dependencies>
<modules>
<module>server-plugin-archetype</module>
- <module>server-plugin-artifact</module>
- <module>server-plugin-htmlreport</module>
- <module>server-plugin-maven</module>
- <module>server-plugin-kubernetes</module>
- <module>server-plugin-serverdocker</module>
- <module>server-plugin-node</module>
- <module>server-plugin-laravel</module>
- <module>server-plugin-rubyonrails</module>
- <module>server-plugin-django</module>
- <module>server-plugin-gradle</module>
+ <module>server-plugin-outcome-artifact</module>
+ <module>server-plugin-outcome-htmlreport</module>
+ <module>server-plugin-cispec-maven</module>
+ <module>server-plugin-executor-kubernetes</module>
+ <module>server-plugin-executor-docker</module>
+ <module>server-plugin-cispec-node</module>
+ <module>server-plugin-cispec-laravel</module>
+ <module>server-plugin-cispec-rubyonrails</module>
+ <module>server-plugin-cispec-django</module>
+ <module>server-plugin-cispec-gradle</module>
</modules>
</project>
diff --git a/server-plugin/server-plugin-gradle/pom.xml b/server-plugin/server-plugin-cispec-django/pom.xml
similarity index 73%
rename from server-plugin/server-plugin-gradle/pom.xml
rename to server-plugin/server-plugin-cispec-django/pom.xml
index 90c88a4e23..2d56305bdd 100644
--- a/server-plugin/server-plugin-gradle/pom.xml
+++ b/server-plugin/server-plugin-cispec-django/pom.xml
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-gradle</artifactId>
+ <artifactId>server-plugin-cispec-django</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>org.server.plugin.gradle.GradleModule</moduleClass>
+ <moduleClass>org.server.plugin.cispec.django.DjangoModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java b/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DefaultDjangoCISpecProvider.java
similarity index 77%
rename from server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java
rename to server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DefaultDjangoCISpecProvider.java
index 07125eb5de..69765a04aa 100644
--- a/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DefaultDjangoCISpecProvider.java
+++ b/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DefaultDjangoCISpecProvider.java
@@ -1,9 +1,11 @@
-package org.server.plugin.django;
+package org.server.plugin.cispec.django;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Lists;
+
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
import io.onedev.server.ci.job.CacheSpec;
@@ -31,7 +33,7 @@ public class DefaultDjangoCISpecProvider implements DefaultCISpecProvider {
job.setName("ci");
- job.setEnvironment("python:3.6");
+ job.setImage("python:3.6");
Blob projectVersionBlob = project.getBlob(new BlobIdent(commitId.name(), "setup.py", FileMode.TYPE_FILE), false);
@@ -44,20 +46,24 @@ public class DefaultDjangoCISpecProvider implements DefaultCISpecProvider {
if(version.isEmpty())
version = "0.0.0";
- job.setCommands("set -e\n"+"buildVersion="+version+"\n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "python -m ensurepip \n"
- + "pip3 install -r requirements.txt \n"
- + "python manage.py test \n"
- + "python setup.py sdist");
+ job.setCommands(Lists.newArrayList(
+ "set -e",
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "python -m ensurepip",
+ "pip3 install -r requirements.txt",
+ "python manage.py test",
+ "python setup.py sdist"));
}else {
version = "0.0.0";
- job.setCommands("set -e\n"+"buildVersion="+version+"\n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "python -m ensurepip \n"
- + "pip3 install -r requirements.txt \n"
- + "python manage.py test \n");
+ job.setCommands(Lists.newArrayList(
+ "set -e",
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "python -m ensurepip",
+ "pip3 install -r requirements.txt",
+ "python manage.py test"));
}
// Trigger the job automatically when there is a push to the branch
diff --git a/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DjangoModule.java b/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DjangoModule.java
similarity index 88%
rename from server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DjangoModule.java
rename to server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DjangoModule.java
index f0d8302fad..0a9152b2e7 100644
--- a/server-plugin/server-plugin-django/src/main/java/org/server/plugin/django/DjangoModule.java
+++ b/server-plugin/server-plugin-cispec-django/src/main/java/org/server/plugin/cispec/django/DjangoModule.java
@@ -1,4 +1,4 @@
-package org.server.plugin.django;
+package org.server.plugin.cispec.django;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
diff --git a/server-plugin/server-plugin-laravel/pom.xml b/server-plugin/server-plugin-cispec-gradle/pom.xml
similarity index 73%
rename from server-plugin/server-plugin-laravel/pom.xml
rename to server-plugin/server-plugin-cispec-gradle/pom.xml
index bc0cdae61e..3bfdc672ff 100644
--- a/server-plugin/server-plugin-laravel/pom.xml
+++ b/server-plugin/server-plugin-cispec-gradle/pom.xml
@@ -1,13 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-laravel</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin</artifactId>
- <version>3.0.1</version>
- </parent>
- <properties>
- <moduleClass>io.onedev.server.plugin.laravel.LaravelPluginModule</moduleClass>
- </properties>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-plugin-cispec-gradle</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <properties>
+ <moduleClass>org.server.plugin.cispec.gradle.GradleModule</moduleClass>
+ </properties>
+</project>
diff --git a/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/DefaultGradleCISpecProvider.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/DefaultGradleCISpecProvider.java
similarity index 80%
rename from server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/DefaultGradleCISpecProvider.java
rename to server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/DefaultGradleCISpecProvider.java
index 427d6ad76d..0544562388 100644
--- a/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/DefaultGradleCISpecProvider.java
+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/DefaultGradleCISpecProvider.java
@@ -1,9 +1,11 @@
-package org.server.plugin.gradle;
+package org.server.plugin.cispec.gradle;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Lists;
+
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
import io.onedev.server.ci.job.CacheSpec;
@@ -47,38 +49,38 @@ public class DefaultGradleCISpecProvider implements DefaultCISpecProvider {
if(androidBlob != null) {
version = getVersion(androidBlob, "versionName");
- job.setEnvironment("ekreative/android");
- job.setCommands("set -e\n"
- +"buildVersion="+version+"\n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "./gradlew test\n"
- + "./gradlew assembleDebug");
+ job.setImage("ekreative/android");
+ job.setCommands(Lists.newArrayList(
+ "set -e",
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "./gradlew test",
+ "./gradlew assembleDebug"));
- }else {
+ } else {
version = getVersion(blob, "version");
jdkVersion = getVersion(blob, "sourceCompatibility");
if(isValidInt(jdkVersion)) {
int jdkVersionInt=Integer.parseInt(jdkVersion);
if(jdkVersionInt>8)
{
- job.setEnvironment("gradle");
+ job.setImage("gradle");
}
else
{
- job.setEnvironment("gradle:5.5.1-jdk8");
+ job.setImage("gradle:5.5.1-jdk8");
}
}else {
- job.setEnvironment("gradle:5.5.1-jdk8");
+ job.setImage("gradle:5.5.1-jdk8");
}
- job.setCommands("set -e\n"
- +"buildVersion="+version+"\n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "gradle clean \n"
- + "gradle build"
- );
-
+ job.setCommands(Lists.newArrayList(
+ "set -e",
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "gradle clean",
+ "gradle build"));
}
// Trigger the job automatically when there is a push to the branch
diff --git a/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/GradleModule.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java
similarity index 88%
rename from server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/GradleModule.java
rename to server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java
index a216867059..6c161a7f51 100644
--- a/server-plugin/server-plugin-gradle/src/main/java/org/server/plugin/gradle/GradleModule.java
+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java
@@ -1,4 +1,4 @@
-package org.server.plugin.gradle;
+package org.server.plugin.cispec.gradle;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
diff --git a/server-plugin/server-plugin-cispec-laravel/pom.xml b/server-plugin/server-plugin-cispec-laravel/pom.xml
new file mode 100644
index 0000000000..535650d614
--- /dev/null
+++ b/server-plugin/server-plugin-cispec-laravel/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-plugin-cispec-laravel</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <properties>
+ <moduleClass>io.onedev.server.plugin.cispec.laravel.LaravelPluginModule</moduleClass>
+ </properties>
+</project>
diff --git a/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/DefaultLaravelCISpecProvider.java b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java
similarity index 86%
rename from server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/DefaultLaravelCISpecProvider.java
rename to server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java
index 2c88469981..722303dd3d 100644
--- a/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/DefaultLaravelCISpecProvider.java
+++ b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/DefaultLaravelCISpecProvider.java
@@ -1,8 +1,10 @@
-package io.onedev.server.plugin.laravel;
+package io.onedev.server.plugin.cispec.laravel;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Lists;
+
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
import io.onedev.server.ci.job.CacheSpec;
@@ -29,14 +31,12 @@ public class DefaultLaravelCISpecProvider implements DefaultCISpecProvider {
job.setName("ci");
- job.setEnvironment("1dev/php7.3:laravel");
+ job.setImage("1dev/php7.3:laravel");
if (content.indexOf("laravel/framework") != -1) {
-
- job.setCommands( ""
- + "composer install \n"
- + "phpunit \n"
- );
+ job.setCommands(Lists.newArrayList(
+ "composer install",
+ "phpunit"));
// Trigger the job automatically when there is a push to the branch
BranchUpdateTrigger trigger = new BranchUpdateTrigger();
diff --git a/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/LaravelPluginModule.java b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/LaravelPluginModule.java
similarity index 90%
rename from server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/LaravelPluginModule.java
rename to server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/LaravelPluginModule.java
index e44614e55e..e744723f35 100644
--- a/server-plugin/server-plugin-laravel/src/main/java/io/onedev/server/plugin/laravel/LaravelPluginModule.java
+++ b/server-plugin/server-plugin-cispec-laravel/src/main/java/io/onedev/server/plugin/cispec/laravel/LaravelPluginModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.laravel;
+package io.onedev.server.plugin.cispec.laravel;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
diff --git a/server-plugin/server-plugin-django/pom.xml b/server-plugin/server-plugin-cispec-maven/pom.xml
similarity index 75%
rename from server-plugin/server-plugin-django/pom.xml
rename to server-plugin/server-plugin-cispec-maven/pom.xml
index 763821a8da..a155ed7138 100644
--- a/server-plugin/server-plugin-django/pom.xml
+++ b/server-plugin/server-plugin-cispec-maven/pom.xml
@@ -1,13 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-django</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin</artifactId>
- <version>3.0.1</version>
- </parent>
- <properties>
- <moduleClass>org.server.plugin.django.DjangoModule</moduleClass>
- </properties>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-plugin-cispec-maven</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <properties>
+ <moduleClass>io.onedev.server.plugin.cispec.maven.MavenModule</moduleClass>
+ </properties>
+</project>
diff --git a/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/DefaultMavenCISpecProvider.java
similarity index 84%
rename from server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java
rename to server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/DefaultMavenCISpecProvider.java
index e45aac567e..34d5282c87 100644
--- a/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/DefaultMavenCISpecProvider.java
+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/DefaultMavenCISpecProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.maven;
+package io.onedev.server.plugin.cispec.maven;
import java.io.StringReader;
@@ -11,6 +11,8 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.Lists;
+
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
import io.onedev.server.ci.job.CacheSpec;
@@ -66,23 +68,23 @@ public class DefaultMavenCISpecProvider implements DefaultCISpecProvider {
try {
if (Integer.parseInt(javaVersion) <= 8)
- job.setEnvironment("maven:3.6.1-jdk-8");
+ job.setImage("maven:3.6.1-jdk-8");
else
- job.setEnvironment("maven:latest");
+ job.setImage("maven:latest");
} catch (NumberFormatException e) {
- job.setEnvironment("maven:3.6.1-jdk-8");
+ job.setImage("maven:3.6.1-jdk-8");
}
/*
* Before running maven test, we extract version of the project and use LogInstruction to tell
* OneDev using extracted version for current build
*/
- job.setCommands(""
- + "echo \"Detecting project version (may require some time while downloading maven dependencies)...\"\n"
- + "buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)\n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "echo\n"
- + "mvn clean test");
+ job.setCommands(Lists.newArrayList(
+ "echo \"Detecting project version (may require some time while downloading maven dependencies)...\"",
+ "buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)",
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "echo",
+ "mvn clean test"));
// Trigger the job automatically when there is a push to the branch
BranchUpdateTrigger trigger = new BranchUpdateTrigger();
diff --git a/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/MavenModule.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java
similarity index 91%
rename from server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/MavenModule.java
rename to server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java
index c24fd298e9..7ef7861dc0 100644
--- a/server-plugin/server-plugin-maven/src/main/java/io/onedev/server/plugin/maven/MavenModule.java
+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.maven;
+package io.onedev.server.plugin.cispec.maven;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
diff --git a/server-plugin/server-plugin-node/pom.xml b/server-plugin/server-plugin-cispec-node/pom.xml
similarity index 74%
rename from server-plugin/server-plugin-node/pom.xml
rename to server-plugin/server-plugin-cispec-node/pom.xml
index c77a7c648e..2cb09030e8 100644
--- a/server-plugin/server-plugin-node/pom.xml
+++ b/server-plugin/server-plugin-cispec-node/pom.xml
@@ -1,14 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-node</artifactId>
+ <artifactId>server-plugin-cispec-node</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.node.NodePluginModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.cispec.node.NodePluginModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/DefaultNodeCISpecProvider.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java
similarity index 77%
rename from server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/DefaultNodeCISpecProvider.java
rename to server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java
index de6403d307..4165f552f7 100644
--- a/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/DefaultNodeCISpecProvider.java
+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/DefaultNodeCISpecProvider.java
@@ -1,7 +1,8 @@
-package io.onedev.server.plugin.node;
+package io.onedev.server.plugin.cispec.node;
import java.io.IOException;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -10,6 +11,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.ci.CISpec;
@@ -49,20 +51,20 @@ public class DefaultNodeCISpecProvider implements DefaultCISpecProvider {
job.setName("ci");
- job.setEnvironment("node:10.16-alpine");
+ job.setImage("node:10.16-alpine");
if (content.indexOf("angular/core") != -1) { // Recognize angular projects
- job.setEnvironment("1dev/node:10.16-alpine-chrome");
+ job.setImage("1dev/node:10.16-alpine-chrome");
version = jsonNode.findValue("version").asText();
- String Commands = ""
- + "buildVersion=" + version + " \n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "echo\n"
- + "npm install \n"
- + "npm install @angular/cli \n";
+ List<String> commands = Lists.newArrayList(
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "echo",
+ "npm install",
+ "npm install @angular/cli");
if (jsonNode.has("scripts")) {
JsonNode jsonScripts = jsonNode.get("scripts");
@@ -86,35 +88,34 @@ public class DefaultNodeCISpecProvider implements DefaultCISpecProvider {
if (valueArray[0] != null) {
for (int i = 0; i < valueIndex; i++) {
- Commands = Commands
- + "npx " + valueArray[i] + " \n";
+ commands.add("npx " + valueArray[i]);
}
} else {
- Commands = Commands
- + "npx ng lint \n"
- + "npx ng test --watch=false --browsers=ChromeHeadless \n"
- + "npx ng build \n";
+ commands.addAll(Lists.newArrayList(
+ "npx ng lint",
+ "npx ng test --watch=false --browsers=ChromeHeadless",
+ "npx ng build"));
}
} else {
- Commands = Commands
- + "npx ng lint \n"
- + "npx ng test --watch=false --browsers=ChromeHeadless \n"
- + "npx ng build \n";
+ commands.addAll(Lists.newArrayList(
+ "npx ng lint",
+ "npx ng test --watch=false --browsers=ChromeHeadless",
+ "npx ng build"));
}
- job.setCommands(Commands);
+ job.setCommands(commands);
} else if (content.indexOf("react") != -1) { // Recognize react projects
version = jsonNode.findValue("version").asText();
- String Commands = ""
- + "buildVersion=" + version + " \n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "echo\n"
- + "npm install typescript \n"
- + "npm install \n"
- + "export CI=TRUE \n";
+ List<String> commands = Lists.newArrayList(
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "echo",
+ "npm install typescript",
+ "npm install",
+ "export CI=TRUE");
if (jsonNode.has("scripts")) {
JsonNode jsonScripts = jsonNode.get("scripts");
@@ -134,30 +135,28 @@ public class DefaultNodeCISpecProvider implements DefaultCISpecProvider {
if (valueArray[0] != null) {
for (int i = 0; i < valueIndex; i++) {
- Commands = Commands + "npx " + valueArray[i] + " \n";
+ commands.add("npx " + valueArray[i]);
}
} else {
- Commands = Commands
- + "npx react-scripts test \n"
- + "npx react-scripts build \n";
+ commands.addAll(Lists.newArrayList(
+ "npx react-scripts test",
+ "npx react-scripts build"));
}
} else {
- Commands = Commands
- + "npx react-scripts test \n"
- + "npx react-scripts build \n";
+ commands.addAll(Lists.newArrayList(
+ "npx react-scripts test",
+ "npx react-scripts build"));
}
- job.setCommands(Commands);
-
+ job.setCommands(commands);
} else if (content.indexOf("vue") != -1) { // Recognize vue projects
-
version = jsonNode.findValue("version").asText();
- String Commands = ""
- + "buildVersion=" + version + " \n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "echo\n"
- + "npm install \n";
+ List<String> commands = Lists.newArrayList(
+ "buildVersion=" + version,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "echo",
+ "npm install");
if (jsonNode.has("scripts")) {
JsonNode jsonScripts = jsonNode.get("scripts");
@@ -177,16 +176,16 @@ public class DefaultNodeCISpecProvider implements DefaultCISpecProvider {
if (valueArray[0] != null) {
for (int i = 0; i < valueIndex; i++) {
- Commands = Commands + "npx " + valueArray[i] + " \n";
+ commands.add("npx " + valueArray[i]);
}
} else {
- Commands = Commands + "npx jest \n";
+ commands.add("npx jest");
}
} else {
- Commands = Commands + "npx jest \n";
+ commands.add("npx jest");
}
- job.setCommands(Commands);
+ job.setCommands(commands);
} else if (content.indexOf("express") != -1) { // Recognize express projects
diff --git a/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/NodePluginModule.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java
similarity index 91%
rename from server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/NodePluginModule.java
rename to server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java
index 982041597a..d1857ed707 100644
--- a/server-plugin/server-plugin-node/src/main/java/io/onedev/server/plugin/node/NodePluginModule.java
+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.node;
+package io.onedev.server.plugin.cispec.node;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
diff --git a/server-plugin/server-plugin-cispec-rubyonrails/pom.xml b/server-plugin/server-plugin-cispec-rubyonrails/pom.xml
new file mode 100644
index 0000000000..fe2949fb36
--- /dev/null
+++ b/server-plugin/server-plugin-cispec-rubyonrails/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-plugin-cispec-rubyonrails</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin</artifactId>
+ <version>3.0.1</version>
+ </parent>
+ <properties>
+ <moduleClass>org.server.plugin.cispec.rubyonrails.RORPluginModule</moduleClass>
+ </properties>
+</project>
diff --git a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRORCISpecProvider.java b/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/DefaultRORCISpecProvider.java
similarity index 83%
rename from server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRORCISpecProvider.java
rename to server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/DefaultRORCISpecProvider.java
index c7d7b558e5..4addeb2e78 100644
--- a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/DefaultRORCISpecProvider.java
+++ b/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/DefaultRORCISpecProvider.java
@@ -1,9 +1,11 @@
-package org.server.plugin.rubyonrails;
+package org.server.plugin.cispec.rubyonrails;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
+import com.google.common.collect.Lists;
+
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultCISpecProvider;
import io.onedev.server.ci.job.CacheSpec;
@@ -59,10 +61,10 @@ public class DefaultRORCISpecProvider implements DefaultCISpecProvider {
rubyVersion = StringUtils.strip(rubyVersion, "ruby-: ");
- job.setEnvironment("ruby:" + rubyVersion);
+ job.setImage("ruby:" + rubyVersion);
} else {
- job.setEnvironment("ruby");
+ job.setImage("ruby");
}
String projectVersion = null;
@@ -85,18 +87,18 @@ public class DefaultRORCISpecProvider implements DefaultCISpecProvider {
}
if(projectVersion == null) {
- job.setCommands("bundle install" + "\n"
- + "rails test");
- }else {
- job.setCommands("set -e\n"+"buildVersion="+projectVersion+"\n"
- + "echo \"##onedev[SetBuildVersion '$buildVersion']\"\n"
- + "bundle install" + "\n"
- + "rails test");
-
+ job.setCommands(Lists.newArrayList(
+ "bundle install",
+ "rails test"));
+ } else {
+ job.setCommands(Lists.newArrayList(
+ "set -e",
+ "buildVersion=" + projectVersion,
+ "echo \"##onedev[SetBuildVersion '$buildVersion']\"",
+ "bundle install",
+ "rails test"));
}
-
-
// Trigger the job automatically when there is a push to the branch
BranchUpdateTrigger trigger = new BranchUpdateTrigger();
job.getTriggers().add(trigger);
diff --git a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/RORPluginModule.java b/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/RORPluginModule.java
similarity index 87%
rename from server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/RORPluginModule.java
rename to server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/RORPluginModule.java
index c57a2aac13..f5bb1dde7d 100644
--- a/server-plugin/server-plugin-rubyonrails/src/main/java/org/server/plugin/rubyonrails/RORPluginModule.java
+++ b/server-plugin/server-plugin-cispec-rubyonrails/src/main/java/org/server/plugin/cispec/rubyonrails/RORPluginModule.java
@@ -1,4 +1,4 @@
-package org.server.plugin.rubyonrails;
+package org.server.plugin.cispec.rubyonrails;
import io.onedev.commons.launcher.loader.AbstractPluginModule;
import io.onedev.server.ci.DefaultCISpecProvider;
diff --git a/server-plugin/server-plugin-maven/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xml
similarity index 75%
rename from server-plugin/server-plugin-maven/pom.xml
rename to server-plugin/server-plugin-executor-docker/pom.xml
index e475227e30..4289fe6a78 100644
--- a/server-plugin/server-plugin-maven/pom.xml
+++ b/server-plugin/server-plugin-executor-docker/pom.xml
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-maven</artifactId>
+ <artifactId>server-plugin-executor-docker</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.maven.MavenModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
new file mode 100644
index 0000000000..40b185a3c0
--- /dev/null
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
@@ -0,0 +1,1018 @@
+package io.onedev.server.plugin.docker;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.codec.Charsets;
+import org.apache.commons.lang3.SystemUtils;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.Maps;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecuteResult;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.ProcessKiller;
+import io.onedev.commons.utils.concurrent.CapacityRunner;
+import io.onedev.k8shelper.CacheInstance;
+import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.OneDev;
+import io.onedev.server.OneException;
+import io.onedev.server.ci.job.JobContext;
+import io.onedev.server.ci.job.JobManager;
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.ci.job.SubmoduleCredential;
+import io.onedev.server.ci.job.Variable;
+import io.onedev.server.git.config.GitConfig;
+import io.onedev.server.model.support.RegistryLogin;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.plugin.docker.DockerExecutor.TestData;
+import io.onedev.server.util.JobLogger;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.PKCS12CertExtractor;
+import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.util.validation.annotation.DnsName;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Horizontal;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.util.Testable;
+
+@Editable(order=200, description="This executor runs CI jobs as docker containers on OneDev server")
+@ClassValidating
+@Horizontal
+public class DockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(DockerExecutor.class);
+
+ private String networkPrefix = "onedev-ci";
+
+ private String dockerExecutable;
+
+ private String runOptions;
+
+ private int capacity = Runtime.getRuntime().availableProcessors();
+
+ private List<RegistryLogin> registryLogins = new ArrayList<>();
+
+ private transient CapacityRunner capacityRunner;
+
+ @Editable(order=30, description="OneDev will create a separate docker network to run each "
+ + "job for isolation purpose. Here you may specify prefix of the network to identify "
+ + "job containers created by this executor")
+ @DnsName
+ @NotEmpty
+ public String getNetworkPrefix() {
+ return networkPrefix;
+ }
+
+ public void setNetworkPrefix(String networkPrefix) {
+ this.networkPrefix = networkPrefix;
+ }
+
+ @Editable(order=100, description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "
+ + "Leave empty to use docker executable in PATH")
+ @NameOfEmptyValue("Use default")
+ public String getDockerExecutable() {
+ return dockerExecutable;
+ }
+
+ public void setDockerExecutable(String dockerExecutable) {
+ this.dockerExecutable = dockerExecutable;
+ }
+
+ @Editable(order=200, description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "
+ + "to limit memory of created container to be 2 giga bytes")
+ public String getRunOptions() {
+ return runOptions;
+ }
+
+ public void setRunOptions(String runOptions) {
+ this.runOptions = runOptions;
+ }
+
+ public static boolean isRegistryAuthenticationRequired() {
+ return (boolean) OneContext.get().getEditContext().getInputValue("authenticateToRegistry");
+ }
+
+ @Editable(order=300, description="Specify max number of concurrent jobs being executed. Each job execution "
+ + "will launch a separate docker container. Defaults to number of processors in the system")
+ public int getCapacity() {
+ return capacity;
+ }
+
+ public void setCapacity(int capacity) {
+ this.capacity = capacity;
+ }
+
+ @Editable(order=400, description="Specify login information for docker registries if necessary")
+ public List<RegistryLogin> getRegistryLogins() {
+ return registryLogins;
+ }
+
+ public void setRegistryLogins(List<RegistryLogin> registryLogins) {
+ this.registryLogins = registryLogins;
+ }
+
+ private Commandline newDocker() {
+ if (getDockerExecutable() != null)
+ return new Commandline(getDockerExecutable());
+ else
+ return new Commandline("docker");
+ }
+
+ private String getImageOS(JobLogger jobLogger, String image) {
+ Commandline docker = newDocker();
+ docker.addArgs("image", "inspect", "-f", "{{.Os}}", image);
+
+ AtomicReference<String> osRef = new AtomicReference<>(null);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ osRef.set(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ return Preconditions.checkNotNull(osRef.get());
+ }
+
+ private synchronized CapacityRunner getCapacityRunner() {
+ if (capacityRunner == null)
+ capacityRunner = new CapacityRunner(capacity);
+ return capacityRunner;
+ }
+
+ private File getCacheHome() {
+ return new File(Bootstrap.getSiteDir(), "job-cache");
+ }
+
+ private String createNetwork(JobContext jobContext, JobLogger jobLogger) {
+ String network = getNetworkPrefix() + "-" + jobContext.getProjectName() + "-" + jobContext.getBuildNumber();
+
+ AtomicBoolean networkExists = new AtomicBoolean(false);
+ Commandline docker = newDocker();
+ docker.addArgs("network", "ls", "-q", "--filter", "name=" + network);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ networkExists.set(true);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ if (networkExists.get()) {
+ clearNetwork(network, jobLogger);
+ } else {
+ docker.clearArgs();
+ docker.addArgs("network", "create", network);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+ }
+
+ return network;
+ }
+
+ private void deleteNetwork(String network, JobLogger jobLogger) {
+ clearNetwork(network, jobLogger);
+
+ Commandline docker = newDocker();
+ docker.clearArgs();
+ docker.addArgs("network", "rm", network);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+ }
+
+ private void clearNetwork(String network, JobLogger jobLogger) {
+ Commandline docker = newDocker();
+
+ List<String> containerIds = new ArrayList<>();
+ docker.addArgs("ps", "-a", "-q", "--filter", "network=" + network);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ containerIds.add(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ for (String container: containerIds) {
+ docker.clearArgs();
+ docker.addArgs("container", "stop", container);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ docker.clearArgs();
+ docker.addArgs("container", "rm", container);
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+ }
+ }
+
+ @SuppressWarnings("resource")
+ private void startService(String network, JobService jobService, JobLogger jobLogger) {
+ jobLogger.log("Pulling service image...") ;
+ Commandline docker = newDocker();
+ docker.addArgs("pull", jobService.getImage());
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ jobLogger.log("Creating service container...");
+
+ String containerName = network + "-service-" + jobService.getName();
+ docker.clearArgs();
+ docker.addArgs("run", "-d", "--name=" + containerName, "--network=" + network,
+ "--network-alias=" + jobService.getName());
+ for (Variable var: jobService.getEnvVars())
+ docker.addArgs("--env", var.getName() + "=" + var.getValue());
+ docker.addArgs(jobService.getImage());
+ if (jobService.getArguments() != null) {
+ for (String token: StringUtils.parseQuoteTokens(jobService.getArguments()))
+ docker.addArgs(token);
+ }
+
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ jobLogger.log("Waiting for service to be ready...");
+
+ boolean isWindows = getImageOS(jobLogger, jobService.getImage()).equalsIgnoreCase("windows");
+ ObjectMapper jsonReader = OneDev.getInstance(ObjectMapper.class);
+ while (true) {
+ StringBuilder builder = new StringBuilder();
+ docker.clearArgs();
+ docker.addArgs("inspect", containerName);
+ docker.execute(new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ builder.append(line).append("\n");
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ JsonNode stateNode;
+ try {
+ stateNode = jsonReader.readTree(builder.toString()).iterator().next().get("State");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ if (stateNode.get("Status").asText().equals("running")) {
+ docker.clearArgs();
+ docker.addArgs("exec", containerName);
+ if (isWindows)
+ docker.addArgs("cmd", "/c", jobService.getReadinessCheckCommand());
+ else
+ docker.addArgs("sh", "-c", jobService.getReadinessCheckCommand());
+
+ ExecuteResult result = docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Service readiness check: " + line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Service readiness check: " + line);
+ }
+
+ });
+ if (result.getReturnCode() == 0) {
+ jobLogger.log("Service is ready");
+ break;
+ }
+ } else if (stateNode.get("Status").asText().equals("exited")) {
+ if (stateNode.get("OOMKilled").asText().equals("true"))
+ jobLogger.log("Out of memory");
+ else if (stateNode.get("Error").asText().length() != 0)
+ jobLogger.log(stateNode.get("Error").asText());
+
+ docker.clearArgs();
+ docker.addArgs("logs", containerName);
+ docker.execute(new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }, new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ throw new OneException(String.format("Service '" + jobService.getName() + "' is stopped unexpectedly"));
+ }
+
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ @Override
+ public void execute(String jobToken, JobContext jobContext) {
+ File hostCIHome = FileUtils.createTempDir("onedev-ci");
+ try {
+ JobLogger jobLogger = jobContext.getLogger();
+
+ getCapacityRunner().call(new Callable<Void>() {
+
+ @SuppressWarnings("resource")
+ @Override
+ public Void call() {
+ String network = createNetwork(jobContext, jobLogger);
+ jobLogger.log("Executing job with docker under network " + network + "...");
+ try {
+ jobContext.notifyJobRunning();
+
+ JobManager jobManager = OneDev.getInstance(JobManager.class);
+ File hostCacheHome = getCacheHome();
+ FileUtils.createDir(hostCacheHome);
+
+ jobLogger.log("Allocating job caches...") ;
+ Map<CacheInstance, Date> cacheInstances = KubernetesHelper.getCacheInstances(hostCacheHome);
+ Map<CacheInstance, String> cacheAllocations = jobManager.allocateJobCaches(jobToken, new Date(), cacheInstances);
+ KubernetesHelper.preprocess(hostCacheHome, cacheAllocations, new Consumer<File>() {
+
+ @Override
+ public void accept(File directory) {
+ cleanDirAsRoot(directory);
+ }
+
+ });
+
+ login(jobLogger);
+
+ for (JobService jobService: jobContext.getServices()) {
+ jobLogger.log("Starting service '" + jobService.getName() + "...");
+ startService(network, jobService, jobLogger);
+ }
+
+ jobLogger.log("Pulling job image...") ;
+ Commandline docker = newDocker();
+ docker.addArgs("pull", jobContext.getImage());
+ docker.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ boolean isWindows = getImageOS(jobLogger, jobContext.getImage()).equalsIgnoreCase("windows");
+
+ File workspaceCache = null;
+ for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
+ if (PathUtils.isCurrent(entry.getValue())) {
+ workspaceCache = entry.getKey().getDirectory(hostCacheHome);
+ break;
+ }
+ }
+
+ File hostWorkspace;
+ if (workspaceCache != null) {
+ hostWorkspace = workspaceCache;
+ } else {
+ hostWorkspace = new File(hostCIHome, "workspace");
+ FileUtils.createDir(hostWorkspace);
+ }
+
+ if (jobContext.isRetrieveSource()) {
+ jobLogger.log("Retrieving source code...");
+ File tempHome = FileUtils.createTempDir();
+ try {
+ Map<String, String> environments = Maps.newHashMap("HOME", tempHome.getAbsolutePath());
+ Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
+ git.environments(environments).workingDir(hostWorkspace);
+ LineConsumer logger = new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ };
+
+ git.addArgs("config", "--global", "credential.modalprompt", "false");
+ git.execute(logger, logger).checkReturnCode();
+
+ // clear credential.helper list to remove possible Windows credential manager
+ git.clearArgs();
+ if (SystemUtils.IS_OS_WINDOWS)
+ git.addArgs("config", "--global", "credential.helper", "\"\"");
+ else
+ git.addArgs("config", "--global", "credential.helper", "");
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("config", "--global", "--add", "credential.helper", "store");
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("config", "--global", "credential.useHttpPath", "true");
+ git.execute(logger, logger).checkReturnCode();
+
+ List<String> trustCertContent = new ArrayList<>();
+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
+ File keystoreFile = serverConfig.getKeystoreFile();
+ if (keystoreFile != null) {
+ String password = serverConfig.getKeystorePassword();
+ for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
+ trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
+ }
+ if (serverConfig.getTrustCertsDir() != null) {
+ for (File file: serverConfig.getTrustCertsDir().listFiles()) {
+ if (file.isFile())
+ trustCertContent.addAll(FileUtils.readLines(file));
+ }
+ }
+
+ if (!trustCertContent.isEmpty()) {
+ File trustCertFile = new File(tempHome, "trust-cert.pem");
+ FileUtils.writeLines(trustCertFile, trustCertContent, "\n");
+ git.clearArgs();
+ git.addArgs("config", "--global", "http.sslCAInfo", trustCertFile.getAbsolutePath());
+ git.execute(logger, logger).checkReturnCode();
+ }
+
+ if (!jobContext.getSubmoduleCredentials().isEmpty()) {
+ List<String> submoduleCredentials = new ArrayList<>();
+ for (SubmoduleCredential submoduleCredential: jobContext.getSubmoduleCredentials()) {
+ String url = submoduleCredential.getUrl();
+ String userName = URLEncoder.encode(submoduleCredential.getUserName(), Charsets.UTF_8.name());
+ String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), Charsets.UTF_8.name());
+ if (url.startsWith("http://")) {
+ submoduleCredentials.add("http://" + userName + ":" + password
+ + "@" + url.substring("http://".length()).replace(":", "%3a"));
+ } else {
+ submoduleCredentials.add("https://" + userName + ":" + password
+ + "@" + url.substring("https://".length()).replace(":", "%3a"));
+ }
+ }
+ FileUtils.writeLines(new File(tempHome, ".git-credentials"), submoduleCredentials, "\n");
+ }
+
+ if (!new File(hostWorkspace, ".git").exists()) {
+ git.clearArgs();
+ git.addArgs("init", ".");
+ git.execute(logger, logger).checkReturnCode();
+ }
+
+ git.clearArgs();
+ git.addArgs("fetch", jobContext.getProjectGitDir().getAbsolutePath(), "--force", "--quiet",
+ "--depth=1", jobContext.getCommitId().name());
+ git.execute(logger, logger).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("checkout", "--quiet", jobContext.getCommitId().name());
+ git.execute(logger, logger).checkReturnCode();
+
+ // deinit submodules in case submodule url is changed
+ git.clearArgs();
+ git.addArgs("submodule", "deinit", "--all", "--force", "--quiet");
+ git.execute(logger, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (!line.contains("error: could not lock config file") &&
+ !line.contains("warning: Could not unset core.worktree setting in submodule")) {
+ jobContext.getLogger().log(line);
+ }
+ }
+
+ }).checkReturnCode();
+
+ git.clearArgs();
+ git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet", "--depth=1");
+ git.execute(logger, logger).checkReturnCode();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ FileUtils.deleteDir(tempHome);
+ }
+ }
+
+ jobLogger.log("Retrieving job dependencies...");
+ try {
+ FileUtils.copyDirectory(jobContext.getServerWorkspace(), hostWorkspace);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ String containerCIHome;
+ String containerWorkspace;
+ String[] containerCommand;
+ if (isWindows) {
+ containerCIHome = "C:\\onedev-ci";
+ containerWorkspace = "C:\\onedev-ci\\workspace";
+ containerCommand = new String[] {"cmd", "/c", "C:\\onedev-ci\\job-commands.bat"};
+
+ File scriptFile = new File(hostCIHome, "job-commands.bat");
+ try {
+ FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\r\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ containerCIHome = "/onedev-ci";
+ containerWorkspace = "/onedev-ci/workspace";
+ containerCommand = new String[] {"sh", "/onedev-ci/job-commands.sh"};
+
+ File scriptFile = new File(hostCIHome, "job-commands.sh");
+ try {
+ FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ String containerName = network + "-job";
+ docker.clearArgs();
+ docker.addArgs("run", "--name=" + containerName, "--network=" + network);
+ for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet())
+ docker.addArgs("--env", entry.getKey() + "=" + entry.getValue());
+ if (getRunOptions() != null)
+ docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+
+ docker.addArgs("-v", hostCIHome.getAbsolutePath() + ":" + containerCIHome);
+ if (workspaceCache != null)
+ docker.addArgs("-v", workspaceCache.getAbsolutePath() + ":" + containerWorkspace);
+ for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
+ if (!PathUtils.isCurrent(entry.getValue())) {
+ String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
+ String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
+ docker.addArgs("-v", hostCachePath + ":" + containerCachePath);
+ }
+ }
+ if (SystemUtils.IS_OS_LINUX)
+ docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
+
+ docker.addArgs("-w", containerWorkspace, jobContext.getImage());
+ docker.addArgs(containerCommand);
+
+ jobLogger.log("Running job container...");
+
+ try {
+ docker.execute(new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }, new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }, null, new ProcessKiller() {
+
+ @Override
+ public void kill(Process process, String executionId) {
+ jobLogger.log("Stopping job container...");
+ Commandline cmd = newDocker();
+ cmd.addArgs("stop", containerName);
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+ }
+
+ }).checkReturnCode();
+ } finally {
+ jobLogger.log("Sending job outcomes...");
+
+ int baseLen = hostWorkspace.getAbsolutePath().length()+1;
+ for (File file: jobContext.getCollectFiles().listFiles(hostWorkspace)) {
+ try {
+ FileUtils.copyFile(file, new File(jobContext.getServerWorkspace(), file.getAbsolutePath().substring(baseLen)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ jobLogger.log("Reporting job caches...");
+
+ jobManager.reportJobCaches(jobToken, KubernetesHelper.getCacheInstances(hostCacheHome).keySet());
+
+ return null;
+ } finally {
+ deleteNetwork(network, jobLogger);
+ }
+ }
+
+ });
+ } finally {
+ cleanDirAsRoot(hostCIHome);
+ FileUtils.deleteDir(hostCIHome);
+ }
+ }
+
+ private void login(JobLogger jobLogger) {
+ for (RegistryLogin login: getRegistryLogins()) {
+ if (login.getRegistryUrl() != null)
+ jobLogger.log(String.format("Login to docker registry '%s'...", login.getRegistryUrl()));
+ else
+ jobLogger.log("Login to official docker registry...");
+ Commandline cmd = newDocker();
+ cmd.addArgs("login", "-u", login.getUserName(), "--password-stdin");
+ if (login.getRegistryUrl() != null)
+ cmd.addArgs(login.getRegistryUrl());
+ ByteArrayInputStream input;
+ try {
+ input = new ByteArrayInputStream(login.getPassword().getBytes(Charsets.UTF_8.name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }, input).checkReturnCode();
+ }
+ }
+
+ private boolean hasOptions(String[] arguments, String... options) {
+ for (String argument: arguments) {
+ for (String option: options) {
+ if (option.startsWith("--")) {
+ if (argument.startsWith(option + "=") || argument.equals(option))
+ return true;
+ } else if (option.startsWith("-")) {
+ if (argument.startsWith(option))
+ return true;
+ } else {
+ throw new RuntimeException("Invalid option: " + option);
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ boolean isValid = true;
+ Set<String> registryUrls = new HashSet<>();
+ for (RegistryLogin login: getRegistryLogins()) {
+ if (!registryUrls.add(login.getRegistryUrl())) {
+ isValid = false;
+ String message;
+ if (login.getRegistryUrl() != null)
+ message = "Duplicate login entry for registry '" + login.getRegistryUrl() + "'";
+ else
+ message = "Duplicate login entry for official registry";
+ context.buildConstraintViolationWithTemplate(message)
+ .addPropertyNode("registryLogins").addConstraintViolation();
+ break;
+ }
+ }
+ if (getRunOptions() != null) {
+ String[] arguments = StringUtils.parseQuoteTokens(getRunOptions());
+ String invalidOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty",
+ "-i", "--interactive", "--rm", "--restart", "--name"};
+ if (hasOptions(arguments, invalidOptions)) {
+ StringBuilder errorMessage = new StringBuilder("Can not use options: "
+ + Joiner.on(", ").join(invalidOptions));
+ context.buildConstraintViolationWithTemplate(errorMessage.toString())
+ .addPropertyNode("runOptions").addConstraintViolation();
+ isValid = false;
+ }
+ }
+ if (!isValid)
+ context.disableDefaultConstraintViolation();
+ return isValid;
+ }
+
+ @Override
+ public void test(TestData testData, JobLogger jobLogger) {
+ login(jobLogger);
+
+ jobLogger.log("Pulling image...");
+
+ Commandline cmd = newDocker();
+ cmd.addArgs("pull", testData.getDockerImage());
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+
+ boolean windows = getImageOS(jobLogger, testData.getDockerImage()).equals("windows");
+
+ jobLogger.log("Running container...");
+ File workspaceDir = null;
+ File cacheDir = null;
+ try {
+ workspaceDir = Bootstrap.createTempDir("workspace");
+ cacheDir = new File(getCacheHome(), UUID.randomUUID().toString());
+ FileUtils.createDir(cacheDir);
+
+ cmd.clearArgs();
+ cmd.addArgs("run", "--rm");
+ if (getRunOptions() != null)
+ cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+ String containerWorkspacePath;
+ String containerCachePath;
+ if (windows) {
+ containerWorkspacePath = "C:\\onedev-ci\\workspace";
+ containerCachePath = "C:\\onedev-ci\\cache";
+ } else {
+ containerWorkspacePath = "/onedev-ci/workspace";
+ containerCachePath = "/onedev-ci/cache";
+ }
+ cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + containerWorkspacePath);
+ cmd.addArgs("-v", cacheDir.getAbsolutePath() + ":" + containerCachePath);
+
+ cmd.addArgs("-w", containerWorkspacePath);
+ cmd.addArgs(testData.getDockerImage());
+
+ if (windows)
+ cmd.addArgs("cmd", "/c", "echo hello from container");
+ else
+ cmd.addArgs("sh", "-c", "echo hello from container");
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+ } finally {
+ if (workspaceDir != null)
+ FileUtils.deleteDir(workspaceDir);
+ if (cacheDir != null)
+ FileUtils.deleteDir(cacheDir);
+ }
+
+ if (!SystemUtils.IS_OS_WINDOWS) {
+ jobLogger.log("Checking busybox...");
+ cmd = newDocker();
+ cmd.addArgs("run", "--rm", "busybox", "sh", "-c", "echo hello from busybox");
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log(line);
+ }
+
+ }).checkReturnCode();
+ }
+ }
+
+ public void cleanDirAsRoot(File dir) {
+ if (SystemUtils.IS_OS_WINDOWS) {
+ FileUtils.cleanDir(dir);
+ } else {
+ Commandline cmd = newDocker();
+ String containerPath = "/dir-to-clean";
+ cmd.addArgs("run", "-v", dir.getAbsolutePath() + ":" + containerPath, "--rm",
+ "busybox", "sh", "-c", "rm -rf " + containerPath + "/*");
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.info(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ }
+ }
+
+ @Editable(name="Specify a Docker Image to Test Against")
+ public static class TestData implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String dockerImage;
+
+ @Editable
+ @OmitName
+ @NotEmpty
+ public String getDockerImage() {
+ return dockerImage;
+ }
+
+ public void setDockerImage(String dockerImage) {
+ this.dockerImage = dockerImage;
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java
similarity index 84%
rename from server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerModule.java
rename to server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java
index da1f6185ee..779f5042d9 100644
--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerModule.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.serverdocker;
+package io.onedev.server.plugin.docker;
import java.util.Collection;
@@ -9,13 +9,13 @@ import io.onedev.commons.launcher.loader.ImplementationProvider;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.ci.job.JobExecutorDiscoverer;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
*
*/
-public class ServerDockerModule extends AbstractPluginModule {
+public class DockerModule extends AbstractPluginModule {
@Override
protected void configure() {
@@ -31,7 +31,7 @@ public class ServerDockerModule extends AbstractPluginModule {
@Override
public Collection<Class<?>> getImplementations() {
- return Sets.newHashSet(ServerDockerExecutor.class);
+ return Sets.newHashSet(DockerExecutor.class);
}
});
@@ -56,7 +56,7 @@ public class ServerDockerModule extends AbstractPluginModule {
}
}).checkReturnCode();
- return new ServerDockerExecutor();
+ return new DockerExecutor();
} catch (Exception e) {
return null;
}
diff --git a/server-plugin/server-plugin-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
similarity index 72%
rename from server-plugin/server-plugin-kubernetes/pom.xml
rename to server-plugin/server-plugin-executor-kubernetes/pom.xml
index 2da7319ae0..77291cd360 100644
--- a/server-plugin/server-plugin-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -2,13 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-kubernetes</artifactId>
+ <artifactId>server-plugin-executor-kubernetes</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.kubernetes.KubernetesModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
similarity index 63%
rename from server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java
rename to server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 3589192a25..0a7b158ea6 100644
--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.kubernetes;
+package io.onedev.server.plugin.executor.kubernetes;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -46,21 +46,27 @@ import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.ci.job.CacheSpec;
import io.onedev.server.ci.job.JobContext;
+import io.onedev.server.ci.job.JobService;
+import io.onedev.server.ci.job.Variable;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.JobExecutor;
import io.onedev.server.model.support.RegistryLogin;
-import io.onedev.server.plugin.kubernetes.KubernetesExecutor.TestData;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.NodeSelectorEntry;
+import io.onedev.server.model.support.jobexecutor.ServiceLocator;
+import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;
import io.onedev.server.util.JobLogger;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
import io.onedev.server.util.inputspec.SecretInput;
+import io.onedev.server.util.validation.annotation.DnsName;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.util.Testable;
-@Editable(order=100, description="This executor interpretates job environments as docker images, "
- + "and will create pods in Kubernetes cluster to run CI jobs")
+@Editable(order=100, description="This executor runs CI jobs as pods in a kubernetes cluster")
+@Horizontal
public class KubernetesExecutor extends JobExecutor implements Testable<TestData> {
private static final long serialVersionUID = 1L;
@@ -75,22 +81,19 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private List<NodeSelectorEntry> nodeSelector = new ArrayList<>();
- private String namespace = "onedev-ci";
+ private String namespacePrefix = "onedev-ci";
private String serviceAccount;
private List<RegistryLogin> registryLogins = new ArrayList<>();
+
+ private List<ServiceLocator> serviceLocators = new ArrayList<>();
private String configFile;
private String kubeCtlPath;
- private String cpuRequest = "500m";
-
- private String memoryRequest = "128m";
-
- @Editable(order=20, description="Optionally specify node selectors of the "
- + "job pods created by this executor")
+ @Editable(order=20, description="Optionally specify node selector of the job pods")
public List<NodeSelectorEntry> getNodeSelector() {
return nodeSelector;
}
@@ -99,14 +102,17 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
this.nodeSelector = nodeSelector;
}
- @Editable(order=30, description="Specify namespace to run the job pods")
+ @Editable(order=30, description="OneDev will create a separate kubernetes namespace to run each "
+ + "job for isolation purpose. Here you may specify prefix of the namespace to identify "
+ + "various job resources created by this executor")
+ @DnsName
@NotEmpty
- public String getNamespace() {
- return namespace;
+ public String getNamespacePrefix() {
+ return namespacePrefix;
}
- public void setNamespace(String namespace) {
- this.namespace = namespace;
+ public void setNamespacePrefix(String namespacePrefix) {
+ this.namespacePrefix = namespacePrefix;
}
@Editable(order=40, description="Optionally specify a service account in above namespace to run the job "
@@ -120,8 +126,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
this.serviceAccount = serviceAccount;
}
- @Editable(order=200, description="Specify login information of docker registries if necessary. These "
- + "logins will be used to create image pull secrets of the job pods")
+ @Editable(order=200, description="Specify login information of docker registries if necessary. "
+ + "These logins will be used to create image pull secrets of the job pods")
public List<RegistryLogin> getRegistryLogins() {
return registryLogins;
}
@@ -130,28 +136,15 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
this.registryLogins = registryLogins;
}
- @Editable(order=24000, name="CPU Request", group="More Settings", description="Specify cpu requirement of jobs using this executor. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu'>"
- + "kubernetes documentation</a> for details")
- @NotEmpty
- public String getCpuRequest() {
- return cpuRequest;
- }
-
- public void setCpuRequest(String cpuRequest) {
- this.cpuRequest = cpuRequest;
+ @Editable(order=25000, group="More Settings", description="Optionally specify where to run service pods "
+ + "specified in job. The first matching locator will be used. If no any locators are found, "
+ + "node selector of the executor will be used")
+ public List<ServiceLocator> getServiceLocators() {
+ return serviceLocators;
}
- @Editable(order=25000, group="More Settings", description="Specify memory requirement of jobs using this executor. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory'>"
- + "kubernetes documentation</a> for details")
- @NotEmpty
- public String getMemoryRequest() {
- return memoryRequest;
- }
-
- public void setMemoryRequest(String memoryRequest) {
- this.memoryRequest = memoryRequest;
+ public void setServiceLocators(List<ServiceLocator> serviceLocators) {
+ this.serviceLocators = serviceLocators;
}
@Editable(name="Kubectl Config File", order=26000, group="More Settings", description=
@@ -162,7 +155,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
public String getConfigFile() {
return configFile;
}
-
+
public void setConfigFile(String configFile) {
this.configFile = configFile;
}
@@ -181,12 +174,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void execute(String jobToken, JobContext jobContext) {
- execute(jobContext.getEnvironment(), jobToken, jobContext.getLogger(), jobContext);
+ execute(jobContext.getImage(), jobToken, jobContext.getLogger(), jobContext);
}
@Override
- public void test(TestData testData, JobLogger logger) {
- execute(testData.getDockerImage(), KubernetesResource.TEST_JOB_TOKEN, logger, null);
+ public void test(TestData testData, JobLogger jobLogger) {
+ execute(testData.getDockerImage(), KubernetesResource.TEST_JOB_TOKEN, jobLogger, null);
}
private Commandline newKubeCtl() {
@@ -199,7 +192,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return cmdline;
}
- private String createResource(Map<Object, Object> resourceDef, Collection<String> secretsToMask, JobLogger logger) {
+ private String createResource(Map<Object, Object> resourceDef, Collection<String> secretsToMask, JobLogger jobLogger) {
Commandline kubectl = newKubeCtl();
File file = null;
try {
@@ -211,7 +204,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
String maskedYaml = resourceYaml;
for (String secret: secretsToMask)
maskedYaml = StringUtils.replace(maskedYaml, secret, SecretInput.MASK);
- KubernetesExecutor.logger.trace("Creating resource:\n" + maskedYaml);
+ logger.trace("Creating resource:\n" + maskedYaml);
FileUtils.writeFile(file, resourceYaml, Charsets.UTF_8.name());
kubectl.addArgs("create", "-f", file.getAbsolutePath(), "-o", "jsonpath={.metadata.name}");
@@ -226,7 +219,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
@@ -240,67 +233,75 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void deleteResource(String resourceType, String resourceName, JobLogger logger) {
+ private void deleteNamespace(String namespace, JobLogger jobLogger) {
Commandline cmd = newKubeCtl();
- cmd.addArgs("delete", resourceType, resourceName, "--namespace=" + getNamespace());
+ cmd.addArgs("delete", "namespace", namespace);
cmd.execute(new LineConsumer() {
@Override
public void consume(String line) {
- KubernetesExecutor.logger.debug(line);
+ logger.debug(line);
}
}, new LineConsumer() {
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
}
- private void createNamespaceIfNotExist(JobLogger logger) {
- Commandline cmd = newKubeCtl();
- cmd.addArgs("get", "namespaces", "-o",
- String.format("jsonpath={.items[?(@.metadata.name=='%s')]}", getNamespace()));
+ private String createNamespace(@Nullable JobContext jobContext, JobLogger jobLogger) {
+ String namespace = getNamespacePrefix() + "-";
+ if (jobContext != null)
+ namespace += jobContext.getProjectName().replace('.', '-').replace('_', '-') + "-" + jobContext.getBuildNumber();
+ else
+ namespace += "executor-test";
- AtomicBoolean hasNamespace = new AtomicBoolean(false);
+ AtomicBoolean namespaceExists = new AtomicBoolean(false);
+ Commandline cmd = newKubeCtl();
+ cmd.addArgs("get", "namespaces", "--field-selector", "metadata.name=" + namespace,
+ "-o", "name");
cmd.execute(new LineConsumer() {
@Override
public void consume(String line) {
- hasNamespace.set(true);
+ namespaceExists.set(true);
}
}, new LineConsumer() {
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
- if (!hasNamespace.get()) {
- cmd = newKubeCtl();
- cmd.addArgs("create", "namespace", getNamespace());
- cmd.execute(new LineConsumer() {
+ if (namespaceExists.get())
+ deleteNamespace(namespace, jobLogger);
+
+ cmd.clearArgs();
+ cmd.addArgs("create", "namespace", namespace);
+ cmd.execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- KubernetesExecutor.logger.debug(line);
- }
-
- }, new LineConsumer() {
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
+
+ }, new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.log("Kubernetes: " + line);
- }
-
- }).checkReturnCode();
- }
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Kubernetes: " + line);
+ }
+
+ }).checkReturnCode();
+
+ return namespace;
}
@Nullable
@@ -351,11 +352,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return null;
}
- private OsInfo getJobOsInfo(JobLogger logger) {
- logger.log("Checking working node operating system...");
+ private OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, JobLogger jobLogger) {
Commandline kubectl = newKubeCtl();
kubectl.addArgs("get", "nodes", "-o", "jsonpath={range .items[*]}{.status.nodeInfo.operatingSystem} {.status.nodeInfo.kernelVersion} {.spec.unschedulable}{'|'}{end}");
- for (NodeSelectorEntry entry: getNodeSelector())
+ for (NodeSelectorEntry entry: nodeSelector)
kubectl.addArgs("-l", entry.getLabelName() + "=" + entry.getLabelValue());
Collection<OsInfo> osInfos = new ArrayList<>();
@@ -365,7 +365,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
@@ -388,21 +388,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();
}
- private List<Map<Object, Object>> getSecretEnvs(String secretName, Collection<String> secretKeys) {
- List<Map<Object, Object>> secretEnvs = new ArrayList<>();
- for (String secretKey: secretKeys) {
- Map<Object, Object> secretEnv = new LinkedHashMap<>();
- secretEnv.put("name", secretKey);
- secretEnv.put("valueFrom", Maps.newLinkedHashMap("secretKeyRef", Maps.newLinkedHashMap(
- "name", secretName,
- "key", secretKey)));
- secretEnvs.add(secretEnv);
- }
- return secretEnvs;
- }
-
@Nullable
- private String createImagePullSecret(JobLogger logger) {
+ private String createImagePullSecret(String namespace, JobLogger jobLogger) {
if (!getRegistryLogins().isEmpty()) {
Map<Object, Object> auths = new LinkedHashMap<>();
for (RegistryLogin login: getRegistryLogins()) {
@@ -416,7 +403,20 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
try {
String dockerConfig = mapper.writeValueAsString(Maps.newLinkedHashMap("auths", auths));
- return createSecret(Maps.newLinkedHashMap(".dockerconfigjson", dockerConfig), "kubernetes.io/dockerconfigjson", logger);
+
+ String secretName = "image-pull-secret";
+ Map<String, String> encodedSecrets = new LinkedHashMap<>();
+ Map<Object, Object> secretDef = Maps.newLinkedHashMap(
+ "apiVersion", "v1",
+ "kind", "Secret",
+ "metadata", Maps.newLinkedHashMap(
+ "name", secretName,
+ "namespace", namespace),
+ "data", Maps.newLinkedHashMap(
+ ".dockerconfigjson", Base64.encodeBase64String(dockerConfig.getBytes(Charsets.UTF_8))));
+ secretDef.put("type", "kubernetes.io/dockerconfigjson");
+ createResource(secretDef, encodedSecrets.values(), jobLogger);
+ return secretName;
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
@@ -426,7 +426,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Nullable
- private String createTrustCertsConfigMap(JobLogger logger) {
+ private String createTrustCertsConfigMap(String namespace, JobLogger jobLogger) {
Map<String, String> configMapData = new LinkedHashMap<>();
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
File keystoreFile = serverConfig.getKeystoreFile();
@@ -452,30 +452,193 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"apiVersion", "v1",
"kind", "ConfigMap",
"metadata", Maps.newLinkedHashMap(
- "generateName", "configmap-",
- "namespace", getNamespace()),
+ "name", "trust-certs",
+ "namespace", namespace),
"data", configMapData);
- return createResource(configMapDef, new HashSet<>(), logger);
+ return createResource(configMapDef, new HashSet<>(), jobLogger);
} else {
return null;
}
}
- private void execute(String dockerImage, String jobToken, JobLogger logger, @Nullable JobContext jobContext) {
- logger.log("Executing job with Kubernetes executor...");
+ private void startService(String namespace, JobContext jobContext, JobService jobService,
+ @Nullable String imagePullSecretName, JobLogger jobLogger) {
+ jobLogger.log("Creating service pod...");
+
+ List<NodeSelectorEntry> nodeSelector = getNodeSelector();
+ for (ServiceLocator locator: getServiceLocators()) {
+ if (locator.isApplicable(jobService)) {
+ nodeSelector = locator.getNodeSelector();
+ break;
+ }
+ }
- createNamespaceIfNotExist(logger);
+ Map<String, Object> podSpec = new LinkedHashMap<>();
+ Map<Object, Object> containerSpec = Maps.newHashMap(
+ "name", "default",
+ "image", jobService.getImage());
+ containerSpec.put("resources", Maps.newLinkedHashMap("requests", Maps.newLinkedHashMap(
+ "cpu", jobService.getCpuRequirement(),
+ "memory", jobService.getMemoryRequirement())));
+ List<Map<Object, Object>> envs = new ArrayList<>();
+ for (Variable envVar: jobService.getEnvVars()) {
+ envs.add(Maps.newLinkedHashMap(
+ "name", envVar.getName(),
+ "value", envVar.getValue()));
+ }
+ if (jobService.getArguments() != null) {
+ List<String> argList = new ArrayList<>();
+ for (String arg: StringUtils.parseQuoteTokens(jobService.getArguments()))
+ argList.add(arg);
+ containerSpec.put("args", argList);
+ }
+ containerSpec.put("env", envs);
+
+ podSpec.put("containers", Lists.<Object>newArrayList(containerSpec));
+ if (imagePullSecretName != null)
+ podSpec.put("imagePullSecrets", Lists.<Object>newArrayList(Maps.newLinkedHashMap("name", imagePullSecretName)));
+ podSpec.put("restartPolicy", "Never");
+
+ if (!nodeSelector.isEmpty())
+ podSpec.put("nodeSelector", toMap(nodeSelector));
+
+ String podName = "service-" + jobService.getName();
+
+ Map<Object, Object> podDef = Maps.newLinkedHashMap(
+ "apiVersion", "v1",
+ "kind", "Pod",
+ "metadata", Maps.newLinkedHashMap(
+ "name", podName,
+ "namespace", namespace,
+ "labels", Maps.newLinkedHashMap(
+ "service", jobService.getName())),
+ "spec", podSpec);
+ createResource(podDef, Sets.newHashSet(), jobLogger);
+
+ Map<Object, Object> serviceDef = Maps.newLinkedHashMap(
+ "apiVersion", "v1",
+ "kind", "Service",
+ "metadata", Maps.newLinkedHashMap(
+ "name", jobService.getName(),
+ "namespace", namespace),
+ "spec", Maps.newLinkedHashMap(
+ "clusterIP", "None",
+ "selector", Maps.newLinkedHashMap(
+ "service", jobService.getName())));
+ createResource(serviceDef, Sets.newHashSet(), jobLogger);
+
+ jobLogger.log("Waiting for service to be ready...");
+
+ checkEventError(namespace, podName, jobLogger);
+
+ OsInfo baselineOsInfo = getBaselineOsInfo(nodeSelector, jobLogger);
+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ while (true) {
+ Commandline kubectl = newKubeCtl();
+ kubectl.addArgs("get", "pod", podName, "-n", namespace, "-o", "json");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ kubectl.execute(baos, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Kubernetes: " + line);
+ }
+
+ }).checkReturnCode();
+
+ JsonNode statusNode;
+ try {
+ statusNode = mapper.readTree(baos.toString()).get("status");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ JsonNode containerStatusesNode = statusNode.get("containerStatuses");
+ if (containerStatusesNode != null) {
+ JsonNode containerStatusNode = containerStatusesNode.iterator().next();
+ JsonNode stateNode = containerStatusNode.get("state");
+ if (stateNode.get("running") != null) {
+ kubectl.clearArgs();
+ kubectl.addArgs("exec", podName, "-n", namespace, "--");
+ if (baselineOsInfo.isLinux())
+ kubectl.addArgs("bash", "-c");
+ else
+ kubectl.addArgs("cmd.exe", "/c");
+ kubectl.addArgs(jobService.getReadinessCheckCommand());
+ ExecuteResult result = kubectl.execute(new LineConsumer() {
- String jobSecretName = null;
- String imagePullSecretName = null;
- String trustCertsConfigMapName = null;
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Service readiness check: " + line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Service readiness check: " + line);
+ }
+
+ });
+ if (result.getReturnCode() == 0) {
+ jobLogger.log("Service is ready");
+ break;
+ }
+ } else if (stateNode.get("terminated") != null) {
+ JsonNode terminatedNode = stateNode.get("terminated");
+ JsonNode reasonNode = terminatedNode.get("reason");
+ String reason = null;
+ if (reasonNode != null && !reasonNode.asText().equals("Error") && !reasonNode.asText().equals("Completed"))
+ reason = reasonNode.asText();
+
+ JsonNode messageNode = terminatedNode.get("message");
+ if (messageNode != null) {
+ if (reason != null)
+ reason += ": " + messageNode.asText();
+ else
+ reason = messageNode.asText();
+ }
+
+ if (reason != null)
+ jobLogger.log(reason);
+
+ collectContainerLog(namespace, podName, "default", null, jobLogger);
+ String message = "Service '" + jobService.getName() + "' is stopped unexpectedly";
+ throw new OneException(message);
+ }
+ }
+
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ private Map<String, String> toMap(List<NodeSelectorEntry> nodeSelector) {
+ Map<String, String> map = new LinkedHashMap<>();
+ for (NodeSelectorEntry entry: nodeSelector)
+ map.put(entry.getLabelName(), entry.getLabelValue());
+ return map;
+ }
+
+ private void execute(String dockerImage, String jobToken, JobLogger jobLogger, @Nullable JobContext jobContext) {
+ String namespace = createNamespace(jobContext, jobLogger);
+ jobLogger.log("Executing job with kubernetes under namespace " + namespace + "...");
+
try {
- Map<String, String> jobSecrets = Maps.newLinkedHashMap(KubernetesHelper.ENV_JOB_TOKEN, jobToken);
- jobSecretName = createSecret(jobSecrets, null, logger);
- imagePullSecretName = createImagePullSecret(logger);
- trustCertsConfigMapName = createTrustCertsConfigMap(logger);
+ String imagePullSecretName = createImagePullSecret(namespace, jobLogger);
+ if (jobContext != null) {
+ for (JobService jobService: jobContext.getServices()) {
+ jobLogger.log("Starting service '" + jobService.getName() + "'...");
+ startService(namespace, jobContext, jobService, imagePullSecretName, jobLogger);
+ }
+ }
+
+ String trustCertsConfigMapName = createTrustCertsConfigMap(namespace, jobLogger);
- OsInfo osInfo = getJobOsInfo(logger);
+ OsInfo baselineOsInfo = getBaselineOsInfo(getNodeSelector(), jobLogger);
Map<String, Object> podSpec = new LinkedHashMap<>();
@@ -488,7 +651,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
String containerCacheHome;
String trustCertsHome;
String dockerSock;
- if (osInfo.isLinux()) {
+ if (baselineOsInfo.isLinux()) {
containerCIHome = "/onedev-ci";
containerCacheHome = containerCIHome + "/cache";
trustCertsHome = containerCIHome + "/trust-certs";
@@ -527,16 +690,19 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
mainContainerSpec.put("volumeMounts", volumeMounts);
- mainContainerSpec.put("resources", Maps.newLinkedHashMap("requests", Maps.newLinkedHashMap(
- "cpu", getCpuRequest(),
- "memory", getMemoryRequest())));
+ if (jobContext != null) {
+ mainContainerSpec.put("resources", Maps.newLinkedHashMap("requests", Maps.newLinkedHashMap(
+ "cpu", jobContext.getCpuRequirement(),
+ "memory", jobContext.getMemoryRequirement())));
+ }
List<Map<Object, Object>> envs = new ArrayList<>();
- Map<Object, Object> serverUrlEnv = Maps.newLinkedHashMap(
+ envs.add(Maps.newLinkedHashMap(
"name", KubernetesHelper.ENV_SERVER_URL,
- "value", getServerUrl());
- envs.add(serverUrlEnv);
- envs.addAll(getSecretEnvs(jobSecretName, jobSecrets.keySet()));
+ "value", getServerUrl()));
+ envs.add(Maps.newLinkedHashMap(
+ "name", KubernetesHelper.ENV_JOB_TOKEN,
+ "value", jobToken));
if (jobContext != null) {
for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet()) {
envs.add(Maps.newLinkedHashMap(
@@ -544,6 +710,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"value", entry.getValue()));
}
}
+
mainContainerSpec.put("env", envs);
List<String> sidecarArgs = Lists.newArrayList(
@@ -573,7 +740,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
Map<Object, Object> sidecarContainerSpec = Maps.newHashMap(
"name", "sidecar",
- "image", "1dev/k8s-helper-" + osInfo.getHelperImageSuffix() + ":" + helperImageVersion,
+ "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,
"command", Lists.newArrayList("java"),
"args", sidecarArgs,
"env", envs,
@@ -581,7 +748,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
Map<Object, Object> initContainerSpec = Maps.newHashMap(
"name", "init",
- "image", "1dev/k8s-helper-" + osInfo.getHelperImageSuffix() + ":" + helperImageVersion,
+ "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,
"command", Lists.newArrayList("java"),
"args", initArgs,
"env", envs,
@@ -600,13 +767,16 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
podSpec.put("serviceAccountName", getServiceAccount());
podSpec.put("restartPolicy", "Never");
+ if (!getNodeSelector().isEmpty())
+ podSpec.put("nodeSelector", toMap(getNodeSelector()));
+
Map<Object, Object> ciHomeVolume = Maps.newLinkedHashMap(
"name", "ci-home",
"emptyDir", Maps.newLinkedHashMap());
Map<Object, Object> cacheHomeVolume = Maps.newLinkedHashMap(
"name", "cache-home",
"hostPath", Maps.newLinkedHashMap(
- "path", osInfo.getCacheHome(),
+ "path", baselineOsInfo.getCacheHome(),
"type", "DirectoryOrCreate"));
List<Object> volumes = Lists.<Object>newArrayList(ciHomeVolume, cacheHomeVolume);
if (trustCertsConfigMapName != null) {
@@ -625,148 +795,135 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
volumes.add(dockerSockVolume);
}
podSpec.put("volumes", volumes);
+
+ String podName = "job";
Map<Object, Object> podDef = Maps.newLinkedHashMap(
"apiVersion", "v1",
"kind", "Pod",
"metadata", Maps.newLinkedHashMap(
- "generateName", "job-",
- "namespace", getNamespace()),
+ "name", podName,
+ "namespace", namespace),
"spec", podSpec);
- String podName = createResource(podDef, Sets.newHashSet(), logger);
- String podFQN = getNamespace() + "/" + podName;
- try {
- logger.log("Preparing job environment...");
-
- KubernetesExecutor.logger.debug("Checking error events (pod: {})...", podFQN);
- // Some errors only reported via events
- checkEventError(podName, logger);
-
- KubernetesExecutor.logger.debug("Waiting for init container to start (pod: {})...", podFQN);
- watchPod(podName, new StatusChecker() {
+ createResource(podDef, Sets.newHashSet(), jobLogger);
+ String podFQN = namespace + "/" + podName;
+ jobLogger.log("Preparing job environment...");
+
+ logger.debug("Checking error events (pod: {})...", podFQN);
+ // Some errors only reported via events
+ checkEventError(namespace, podName, jobLogger);
+
+ logger.debug("Waiting for init container to start (pod: {})...", podFQN);
+ watchPod(namespace, podName, new StatusChecker() {
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
- if (initContainerStatusesNode != null) {
- for (JsonNode initContainerStatusNode: initContainerStatusesNode) {
- JsonNode stateNode = initContainerStatusNode.get("state");
- if (initContainerStatusNode.get("name").asText().equals("init")
- && (stateNode.get("running") != null || stateNode.get("terminated") != null)) {
- return new StopWatch(null);
- }
- }
- }
+ @Override
+ public StopWatch check(JsonNode statusNode) {
+ JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
+ if (isContainerStarted(initContainerStatusesNode, "init"))
+ return new StopWatch(null);
+ else
return null;
- }
-
- }, logger);
-
- if (jobContext != null)
- jobContext.notifyJobRunning();
+ }
- AtomicReference<String> nodeNameRef = new AtomicReference<>(null);
- Commandline kubectl = newKubeCtl();
- kubectl.addArgs("get", "pod", podName, "-n", getNamespace(), "-o", "jsonpath={.spec.nodeName}");
- kubectl.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- nodeNameRef.set(line);
- }
-
- }, new LineConsumer() {
+ }, jobLogger);
+
+ if (jobContext != null)
+ jobContext.notifyJobRunning();
+
+ AtomicReference<String> nodeNameRef = new AtomicReference<>(null);
+ Commandline kubectl = newKubeCtl();
+ kubectl.addArgs("get", "pod", podName, "-n", namespace, "-o", "jsonpath={.spec.nodeName}");
+ kubectl.execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.log("Kubernetes: " + line);
- }
-
- }).checkReturnCode();
-
- String nodeName = Preconditions.checkNotNull(nodeNameRef.get());
- logger.log("Running pod " + podFQN + " on node " + nodeName + "...");
-
- KubernetesExecutor.logger.debug("Collecting init container log (pod: {})...", podFQN);
- collectContainerLog(podName, "init", logger);
+ @Override
+ public void consume(String line) {
+ nodeNameRef.set(line);
+ }
- if (jobContext != null)
- updateCacheLabels(nodeName, jobContext, logger);
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobLogger.log("Kubernetes: " + line);
+ }
- KubernetesExecutor.logger.debug("Waiting for main container to start (pod: {})...", podFQN);
- watchPod(podName, new StatusChecker() {
+ }).checkReturnCode();
+
+ String nodeName = Preconditions.checkNotNull(nodeNameRef.get());
+ jobLogger.log("Running job as pod " + podFQN + " on node " + nodeName + "...");
+
+ logger.debug("Collecting init container log (pod: {})...", podFQN);
+ collectContainerLog(namespace, podName, "init", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
+
+ if (jobContext != null)
+ updateCacheLabels(nodeName, jobContext, jobLogger);
+
+ logger.debug("Waiting for main container to start (pod: {})...", podFQN);
+ watchPod(namespace, podName, new StatusChecker() {
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
- String errorMessage = getContainerError(initContainerStatusesNode, "init");
- if (errorMessage != null)
- return new StopWatch(new OneException("Error executing init logic: " + errorMessage));
-
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- if (isContainerStarted(containerStatusesNode, "main"))
- return new StopWatch(null);
- else
- return null;
- }
+ @Override
+ public StopWatch check(JsonNode statusNode) {
+ JsonNode initContainerStatusesNode = statusNode.get("initContainerStatuses");
+ String errorMessage = getContainerError(initContainerStatusesNode, "init");
+ if (errorMessage != null)
+ return new StopWatch(new OneException("Error executing init logic: " + errorMessage));
- }, logger);
+ JsonNode containerStatusesNode = statusNode.get("containerStatuses");
+ if (isContainerStarted(containerStatusesNode, "main"))
+ return new StopWatch(null);
+ else
+ return null;
+ }
- KubernetesExecutor.logger.debug("Collecting main container log (pod: {})...", podFQN);
- collectContainerLog(podName, "main", logger);
+ }, jobLogger);
+
+ logger.debug("Collecting main container log (pod: {})...", podFQN);
+ collectContainerLog(namespace, podName, "main", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
+
+ logger.debug("Waiting for sidecar container to start (pod: {})...", podFQN);
+ watchPod(namespace, podName, new StatusChecker() {
+
+ @Override
+ public StopWatch check(JsonNode statusNode) {
+ JsonNode containerStatusesNode = statusNode.get("containerStatuses");
+ if (isContainerStarted(containerStatusesNode, "sidecar"))
+ return new StopWatch(null);
+ else
+ return null;
+ }
- KubernetesExecutor.logger.debug("Waiting for sidecar container to start (pod: {})...", podFQN);
- watchPod(podName, new StatusChecker() {
+ }, jobLogger);
+
+ logger.debug("Collecting sidecar container log (pod: {})...", podFQN);
+ collectContainerLog(namespace, podName, "sidecar", KubernetesHelper.LOG_END_MESSAGE, jobLogger);
+
+ logger.debug("Checking execution result (pod: {})...", podFQN);
+ watchPod(namespace, podName, new StatusChecker() {
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- if (isContainerStarted(containerStatusesNode, "sidecar"))
+ @Override
+ public StopWatch check(JsonNode statusNode) {
+ JsonNode containerStatusesNode = statusNode.get("containerStatuses");
+ String errorMessage = getContainerError(containerStatusesNode, "main");
+ if (errorMessage != null) {
+ return new StopWatch(new OneException(errorMessage));
+ } else {
+ errorMessage = getContainerError(containerStatusesNode, "sidecar");
+ if (errorMessage != null)
+ return new StopWatch(new OneException("Error executing sidecar logic: " + errorMessage));
+ else if (isContainerStopped(containerStatusesNode, "sidecar"))
return new StopWatch(null);
else
return null;
}
-
- }, logger);
-
- KubernetesExecutor.logger.debug("Collecting sidecar container log (pod: {})...", podFQN);
- collectContainerLog(podName, "sidecar", logger);
-
- KubernetesExecutor.logger.debug("Checking execution result (pod: {})...", podFQN);
- watchPod(podName, new StatusChecker() {
-
- @Override
- public StopWatch check(JsonNode statusNode) {
- JsonNode containerStatusesNode = statusNode.get("containerStatuses");
- String errorMessage = getContainerError(containerStatusesNode, "main");
- if (errorMessage != null) {
- return new StopWatch(new OneException(errorMessage));
- } else {
- errorMessage = getContainerError(containerStatusesNode, "sidecar");
- if (errorMessage != null)
- return new StopWatch(new OneException("Error executing sidecar logic: " + errorMessage));
- else if (isContainerStopped(containerStatusesNode, "sidecar"))
- return new StopWatch(null);
- else
- return null;
- }
- }
-
- }, logger);
+ }
- if (jobContext != null)
- updateCacheLabels(nodeName, jobContext, logger);
- } finally {
- deleteResource("pod", podName, logger);
- }
+ }, jobLogger);
+
+ if (jobContext != null)
+ updateCacheLabels(nodeName, jobContext, jobLogger);
} finally {
- if (trustCertsConfigMapName != null)
- deleteResource("configmap", trustCertsConfigMapName, logger);
- if (jobSecretName != null)
- deleteResource("secret", jobSecretName, logger);
- if (imagePullSecretName != null)
- deleteResource("secret", imagePullSecretName, logger);
+ deleteNamespace(namespace, jobLogger);
}
}
@@ -833,8 +990,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return false;
}
- private void updateCacheLabels(String nodeName, JobContext jobContext, JobLogger logger) {
- logger.log("Updating cache labels on node...");
+ private void updateCacheLabels(String nodeName, JobContext jobContext, JobLogger jobLogger) {
+ jobLogger.log("Updating cache labels on node...");
Commandline kubectl = newKubeCtl();
kubectl.clearArgs();
@@ -856,13 +1013,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
JsonNode nodeNode;
- KubernetesExecutor.logger.trace("Node json:\n" + nodeJson.toString());
+ logger.trace("Node json:\n" + nodeJson.toString());
try {
nodeNode = OneDev.getInstance(ObjectMapper.class).readTree(nodeJson.toString());
} catch (IOException e) {
@@ -900,7 +1057,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
- KubernetesExecutor.logger.debug(line);
+ logger.debug(line);
}
}, new LineConsumer() {
@@ -909,7 +1066,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
public void consume(String line) {
if (line.startsWith("label") && line.endsWith("not found."))
labelNotFound.set(true);
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
});
@@ -918,23 +1075,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private String createSecret(Map<String, String> secrets, @Nullable String type, JobLogger logger) {
- Map<String, String> encodedSecrets = new LinkedHashMap<>();
- for (Map.Entry<String, String> entry: secrets.entrySet())
- encodedSecrets.put(entry.getKey(), Base64.encodeBase64String(entry.getValue().getBytes(Charsets.UTF_8)));
- Map<Object, Object> secretDef = Maps.newLinkedHashMap(
- "apiVersion", "v1",
- "kind", "Secret",
- "metadata", Maps.newLinkedHashMap(
- "generateName", "secret-",
- "namespace", getNamespace()),
- "data", encodedSecrets);
- if (type != null)
- secretDef.put("type", type);
- return createResource(secretDef, encodedSecrets.values(), logger);
- }
-
- private void watchPod(String podName, StatusChecker statusChecker, JobLogger logger) {
+ private void watchPod(String namespace, String podName, StatusChecker statusChecker, JobLogger jobLogger) {
Commandline kubectl = newKubeCtl();
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
@@ -942,7 +1083,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
AtomicReference<StopWatch> stopWatchRef = new AtomicReference<>(null);
StringBuilder json = new StringBuilder();
- kubectl.addArgs("get", "pod", podName, "-n", getNamespace(), "--watch", "-o", "json");
+ kubectl.addArgs("get", "pod", podName, "-n", namespace, "--watch", "-o", "json");
Thread thread = Thread.currentThread();
try {
@@ -954,11 +1095,11 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
json.append("{").append("\n");
} else if (line.startsWith("}")) {
json.append("}");
- KubernetesExecutor.logger.trace("Pod watching output:\n" + json.toString());
+ logger.trace("Pod watching output:\n" + json.toString());
try {
process(mapper.readTree(json.toString()));
} catch (Exception e) {
- KubernetesExecutor.logger.error("Error processing pod watching output", e);
+ logger.error("Error processing pod watching output", e);
}
json.setLength(0);
} else {
@@ -975,7 +1116,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
if (conditionNode.get("type").asText().equals("PodScheduled")
&& conditionNode.get("status").asText().equals("False")
&& conditionNode.get("reason").asText().equals("Unschedulable")) {
- logger.log("Kubernetes: " + conditionNode.get("message").asText());
+ jobLogger.log("Kubernetes: " + conditionNode.get("message").asText());
}
}
}
@@ -1021,7 +1162,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
@@ -1038,13 +1179,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void checkEventError(String podName, JobLogger logger) {
+ private void checkEventError(String namespace, String podName, JobLogger jobLogger) {
Commandline kubectl = newKubeCtl();
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
StringBuilder json = new StringBuilder();
- kubectl.addArgs("get", "event", "-n", getNamespace(), "--field-selector",
+ kubectl.addArgs("get", "event", "-n", namespace, "--field-selector",
"involvedObject.kind=Pod,involvedObject.name=" + podName, "--watch",
"-o", "json");
Thread thread = Thread.currentThread();
@@ -1058,7 +1199,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
json.append("{").append("\n");
} else if (line.startsWith("}")) {
json.append("}");
- KubernetesExecutor.logger.trace("Watching event:\n" + json.toString());
+ logger.trace("Watching event:\n" + json.toString());
try {
JsonNode eventNode = mapper.readTree(json.toString());
String type = eventNode.get("type").asText();
@@ -1067,7 +1208,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
String message = messageNode!=null? messageNode.asText(): reason;
if (type.equals("Warning")) {
if (reason.equals("FailedScheduling"))
- logger.log("Kubernetes: " + message);
+ jobLogger.log("Kubernetes: " + message);
else
stopWatchRef.set(new StopWatch(new OneException(message)));
} else if (type.equals("Normal") && reason.equals("Started")) {
@@ -1076,7 +1217,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
if (stopWatchRef.get() != null)
thread.interrupt();
} catch (Exception e) {
- KubernetesExecutor.logger.error("Error processing event watching record", e);
+ logger.error("Error processing event watching record", e);
}
json.setLength(0);
} else {
@@ -1088,12 +1229,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
@Override
public void consume(String line) {
- logger.log("Kubernetes: " + line);
+ jobLogger.log("Kubernetes: " + line);
}
}).checkReturnCode();
- throw new OneException("Unexpected end of pod watching");
+ throw new OneException("Unexpected end of event watching");
} catch (Exception e) {
StopWatch stopWatch = stopWatchRef.get();
if (stopWatch != null) {
@@ -1105,81 +1246,77 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void collectContainerLog(String podName, String containerName, JobLogger logger) {
- AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);
- AtomicBoolean endOfLogSeenRef = new AtomicBoolean(false);
-
- while (!endOfLogSeenRef.get()) {
- Commandline kubectl = newKubeCtl();
- kubectl.addArgs("logs", podName, "-c", containerName, "-n", getNamespace(), "--follow", "--timestamps=true");
- if (lastInstantRef.get() != null)
- kubectl.addArgs("--since-time=" + DateTimeFormatter.ISO_INSTANT.format(lastInstantRef.get()));
+ private void collectContainerLog(String namespace, String podName, String containerName,
+ @Nullable String logEndMessage, JobLogger jobLogger) {
+ if (logEndMessage != null) {
+ AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);
+ AtomicBoolean endOfLogSeenRef = new AtomicBoolean(false);
+ while (true) {
+ Commandline kubectl = newKubeCtl();
+ kubectl.addArgs("logs", podName, "-c", containerName, "-n", namespace, "--follow", "--timestamps=true");
+ if (lastInstantRef.get() != null)
+ kubectl.addArgs("--since-time=" + DateTimeFormatter.ISO_INSTANT.format(lastInstantRef.get()));
+
+ LineConsumer logConsumer = new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.contains("rpc error:") && line.contains("No such container:")
+ || line.contains("Unable to retrieve container logs for")) {
+ logger.debug(line);
+ } else if (line.contains(logEndMessage)) {
+ endOfLogSeenRef.set(true);
+ } else if (line.contains(" ")) {
+ String timestamp = StringUtils.substringBefore(line, " ");
+ try {
+ Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));
+ if (lastInstantRef.get() == null || lastInstantRef.get().isBefore(instant))
+ lastInstantRef.set(instant);
+ jobLogger.log(StringUtils.substringAfter(line, " "));
+ } catch (DateTimeParseException e) {
+ jobLogger.log(line);
+ }
+ } else {
+ jobLogger.log(line);
+ }
+ }
+
+ };
+
+ kubectl.execute(logConsumer, logConsumer).checkReturnCode();
+
+ if (endOfLogSeenRef.get()) {
+ break;
+ } else {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ } else {
+ Commandline kubectl = newKubeCtl();
+ kubectl.addArgs("logs", podName, "-c", containerName, "-n", namespace, "--follow");
LineConsumer logConsumer = new LineConsumer() {
@Override
public void consume(String line) {
if (line.contains("rpc error:") && line.contains("No such container:")
|| line.contains("Unable to retrieve container logs for")) {
- KubernetesExecutor.logger.debug(line);
- } else if (line.contains(KubernetesHelper.LOG_END_MESSAGE)) {
- endOfLogSeenRef.set(true);
- } else if (line.contains(" ")) {
- String timestamp = StringUtils.substringBefore(line, " ");
- try {
- Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));
- if (lastInstantRef.get() == null || lastInstantRef.get().isBefore(instant))
- lastInstantRef.set(instant);
- logger.log(StringUtils.substringAfter(line, " "));
- } catch (DateTimeParseException e) {
- logger.log(line);
- }
+ logger.debug(line);
} else {
- logger.log(line);
+ jobLogger.log(line);
}
}
};
kubectl.execute(logConsumer, logConsumer).checkReturnCode();
-
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
}
}
- @Editable
- public static class NodeSelectorEntry implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String labelName;
-
- private String labelValue;
-
- @Editable(order=100)
- public String getLabelName() {
- return labelName;
- }
-
- public void setLabelName(String labelName) {
- this.labelName = labelName;
- }
-
- @Editable(order=200)
- public String getLabelValue() {
- return labelValue;
- }
-
- public void setLabelValue(String labelValue) {
- this.labelValue = labelValue;
- }
-
- }
-
private static interface StatusChecker {
StopWatch check(JsonNode statusNode);
diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java
similarity index 94%
rename from server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesModule.java
rename to server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java
index 85a5124735..f6380963d5 100644
--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesModule.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.kubernetes;
+package io.onedev.server.plugin.executor.kubernetes;
import java.util.Collection;
@@ -11,7 +11,7 @@ import io.onedev.commons.launcher.loader.ImplementationProvider;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.ci.job.JobExecutorDiscoverer;
-import io.onedev.server.model.support.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.rest.jersey.JerseyConfigurator;
/**
diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
similarity index 98%
rename from server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java
rename to server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
index 9091ab079f..95cc2adb17 100644
--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.kubernetes;
+package io.onedev.server.plugin.executor.kubernetes;
import java.io.IOException;
import java.io.InputStream;
diff --git a/server-plugin/server-plugin-artifact/pom.xml b/server-plugin/server-plugin-outcome-artifact/pom.xml
similarity index 73%
rename from server-plugin/server-plugin-artifact/pom.xml
rename to server-plugin/server-plugin-outcome-artifact/pom.xml
index 6e8119788e..d379eb8c71 100644
--- a/server-plugin/server-plugin-artifact/pom.xml
+++ b/server-plugin/server-plugin-outcome-artifact/pom.xml
@@ -2,13 +2,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-artifact</artifactId>
+ <artifactId>server-plugin-outcome-artifact</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.artifact.ArtifactModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.outcome.artifact.ArtifactModule</moduleClass>
</properties>
</project>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactDownloadResource.java
similarity index 98%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactDownloadResource.java
index 51393cd98c..dfc90bd64c 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResource.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactDownloadResource.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import java.io.File;
import java.io.FileInputStream;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResourceReference.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactDownloadResourceReference.java
similarity index 89%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResourceReference.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactDownloadResourceReference.java
index c41c4e9e78..93e0596de5 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactDownloadResourceReference.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactDownloadResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactModule.java
similarity index 97%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactModule.java
index 937dd12025..947e99b2f8 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactModule.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import java.io.File;
import java.util.ArrayList;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactsPopulator.java
similarity index 90%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactsPopulator.java
index 558faa24c9..988dd7d6ed 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/ArtifactsPopulator.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import java.io.File;
import java.util.concurrent.Callable;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsCssResourceReference.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsCssResourceReference.java
similarity index 87%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsCssResourceReference.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsCssResourceReference.java
index f4354a22f7..4e39e62d1f 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsCssResourceReference.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.html b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsPage.html
similarity index 100%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.html
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsPage.html
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsPage.java
similarity index 99%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsPage.java
index aa12eedb8e..b7ac8c1bd2 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/BuildArtifactsPage.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/BuildArtifactsPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import java.io.File;
import java.io.FileFilter;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/JobArtifacts.java
similarity index 92%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/JobArtifacts.java
index 6e6cce1527..156c7f627e 100644
--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java
+++ b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/JobArtifacts.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.artifact;
+package io.onedev.server.plugin.outcome.artifact;
import java.io.File;
import java.io.IOException;
diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/build-artifacts.css b/server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/build-artifacts.css
similarity index 100%
rename from server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/build-artifacts.css
rename to server-plugin/server-plugin-outcome-artifact/src/main/java/io/onedev/server/plugin/outcome/artifact/build-artifacts.css
diff --git a/server-plugin/server-plugin-htmlreport/pom.xml b/server-plugin/server-plugin-outcome-htmlreport/pom.xml
similarity index 72%
rename from server-plugin/server-plugin-htmlreport/pom.xml
rename to server-plugin/server-plugin-outcome-htmlreport/pom.xml
index 7e1f1e55fa..fbbc7657f4 100644
--- a/server-plugin/server-plugin-htmlreport/pom.xml
+++ b/server-plugin/server-plugin-outcome-htmlreport/pom.xml
@@ -2,13 +2,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-htmlreport</artifactId>
+ <artifactId>server-plugin-outcome-htmlreport</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>3.0.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.htmlreport.HtmlReportModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.outcome.htmlreport.HtmlReportModule</moduleClass>
</properties>
</project>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportDownloadResource.java
similarity index 98%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportDownloadResource.java
index 2d0cb23eda..d3f309ce19 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResource.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportDownloadResource.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import java.io.File;
import java.io.FileInputStream;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResourceReference.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportDownloadResourceReference.java
similarity index 88%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResourceReference.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportDownloadResourceReference.java
index 5da75e85ec..596b3cc3eb 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportDownloadResourceReference.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportDownloadResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportModule.java
similarity index 98%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportModule.java
index bdf19c648f..a1a33b149a 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportModule.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import java.io.File;
import java.util.ArrayList;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.html b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportPage.html
similarity index 100%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.html
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportPage.html
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportPage.java
similarity index 98%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportPage.java
index 8a3a9eba9f..6ceb339aba 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportPage.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import java.io.File;
import java.util.HashMap;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportResourceReference.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportResourceReference.java
similarity index 93%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportResourceReference.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportResourceReference.java
index ffb75a2601..214496e713 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportResourceReference.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import java.util.List;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportTab.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportTab.java
similarity index 96%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportTab.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportTab.java
index 026ac1bbb4..f43c2be93a 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/HtmlReportTab.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/HtmlReportTab.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/JobHtmlReport.java
similarity index 94%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/JobHtmlReport.java
index afd62678d7..25c8a75c9b 100644
--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java
+++ b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/JobHtmlReport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.htmlreport;
+package io.onedev.server.plugin.outcome.htmlreport;
import java.io.File;
import java.io.IOException;
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.css b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/html-report.css
similarity index 100%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.css
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/html-report.css
diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.js b/server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/html-report.js
similarity index 100%
rename from server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/html-report.js
rename to server-plugin/server-plugin-outcome-htmlreport/src/main/java/io/onedev/server/plugin/outcome/htmlreport/html-report.js
diff --git a/server-plugin/server-plugin-rubyonrails/pom.xml b/server-plugin/server-plugin-rubyonrails/pom.xml
deleted file mode 100644
index 980137e0f7..0000000000
--- a/server-plugin/server-plugin-rubyonrails/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-rubyonrails</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin</artifactId>
- <version>3.0.1</version>
- </parent>
- <properties>
- <moduleClass>org.server.plugin.rubyonrails.RORPluginModule</moduleClass>
- </properties>
-</project>
diff --git a/server-plugin/server-plugin-serverdocker/pom.xml b/server-plugin/server-plugin-serverdocker/pom.xml
deleted file mode 100644
index 002a38535c..0000000000
--- a/server-plugin/server-plugin-serverdocker/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-serverdocker</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server-plugin</artifactId>
- <version>3.0.1</version>
- </parent>
- <properties>
- <moduleClass>io.onedev.server.plugin.serverdocker.ServerDockerModule</moduleClass>
- </properties>
-</project>
diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
deleted file mode 100644
index 4bf27b939c..0000000000
--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java
+++ /dev/null
@@ -1,635 +0,0 @@
-package io.onedev.server.plugin.serverdocker;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.function.Consumer;
-
-import javax.validation.ConstraintValidatorContext;
-
-import org.apache.commons.codec.Charsets;
-import org.apache.commons.lang3.SystemUtils;
-import org.hibernate.validator.constraints.NotEmpty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-
-import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.Maps;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.commons.utils.command.ProcessKiller;
-import io.onedev.commons.utils.concurrent.CapacityRunner;
-import io.onedev.k8shelper.CacheInstance;
-import io.onedev.k8shelper.KubernetesHelper;
-import io.onedev.server.OneDev;
-import io.onedev.server.ci.job.JobContext;
-import io.onedev.server.ci.job.JobManager;
-import io.onedev.server.ci.job.SubmoduleCredential;
-import io.onedev.server.git.config.GitConfig;
-import io.onedev.server.model.support.JobExecutor;
-import io.onedev.server.model.support.RegistryLogin;
-import io.onedev.server.plugin.serverdocker.ServerDockerExecutor.TestData;
-import io.onedev.server.util.JobLogger;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.PKCS12CertExtractor;
-import io.onedev.server.util.ServerConfig;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.util.Testable;
-
-@Editable(order=200, description="This executor interpretates job environments as docker images, "
- + "and will execute CI jobs inside docker containers created on OneDev server")
-@ClassValidating
-public class ServerDockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
-
- private static final long serialVersionUID = 1L;
-
- private static final Logger logger = LoggerFactory.getLogger(ServerDockerExecutor.class);
-
- private String dockerExecutable;
-
- private String runOptions;
-
- private int capacity = Runtime.getRuntime().availableProcessors();
-
- private List<RegistryLogin> registryLogins = new ArrayList<>();
-
- private transient CapacityRunner capacityRunner;
-
- @Editable(order=100, description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "
- + "Leave empty to use docker executable in PATH")
- @NameOfEmptyValue("Use default")
- public String getDockerExecutable() {
- return dockerExecutable;
- }
-
- public void setDockerExecutable(String dockerExecutable) {
- this.dockerExecutable = dockerExecutable;
- }
-
- @Editable(order=20100, group="More Settings", description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "
- + "to limit memory of created container to be 2 giga bytes")
- public String getRunOptions() {
- return runOptions;
- }
-
- public void setRunOptions(String runOptions) {
- this.runOptions = runOptions;
- }
-
- public static boolean isRegistryAuthenticationRequired() {
- return (boolean) OneContext.get().getEditContext().getInputValue("authenticateToRegistry");
- }
-
- @Editable(order=20200, group="More Settings", description="Specify max number of concurrent jobs being executed. Each job execution "
- + "will launch a separate docker container. Defaults to number of processors in the system")
- public int getCapacity() {
- return capacity;
- }
-
- public void setCapacity(int capacity) {
- this.capacity = capacity;
- }
-
- @Editable(order=20300, group="More Settings", description="Specify login information for docker registries if necessary")
- public List<RegistryLogin> getRegistryLogins() {
- return registryLogins;
- }
-
- public void setRegistryLogins(List<RegistryLogin> registryLogins) {
- this.registryLogins = registryLogins;
- }
-
- private Commandline getDocker() {
- if (getDockerExecutable() != null)
- return new Commandline(getDockerExecutable());
- else
- return new Commandline("docker");
- }
-
- private String getImageOS(JobLogger logger, String image) {
- logger.log("Checking image OS...");
- Commandline docker = getDocker();
- docker.addArgs("inspect", image);
-
- StringBuilder builder = new StringBuilder();
- docker.execute(new LineConsumer(Charsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- ServerDockerExecutor.logger.trace(line);
- builder.append(line).append("\n");
- }
-
- }, newJobLogger(logger)).checkReturnCode();
-
- try {
- return OneDev.getInstance(ObjectMapper.class).readTree(builder.toString()).iterator().next().get("Os").asText();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private synchronized CapacityRunner getCapacityRunner() {
- if (capacityRunner == null)
- capacityRunner = new CapacityRunner(capacity);
- return capacityRunner;
- }
-
- private File getCacheHome() {
- return new File(Bootstrap.getSiteDir(), "job-cache");
- }
-
- @Override
- public void execute(String jobToken, JobContext jobContext) {
- jobContext.getLogger().log("Executing job with server docker executor...");
-
- File hostCIHome = FileUtils.createTempDir("onedev-ci");
- try {
- JobLogger logger = jobContext.getLogger();
-
- getCapacityRunner().call(new Callable<Void>() {
-
- @Override
- public Void call() {
- jobContext.notifyJobRunning();
-
- JobManager jobManager = OneDev.getInstance(JobManager.class);
- File hostCacheHome = getCacheHome();
- FileUtils.createDir(hostCacheHome);
-
- logger.log("Allocating job caches...") ;
- Map<CacheInstance, Date> cacheInstances = KubernetesHelper.getCacheInstances(hostCacheHome);
- Map<CacheInstance, String> cacheAllocations = jobManager.allocateJobCaches(jobToken, new Date(), cacheInstances);
- KubernetesHelper.preprocess(hostCacheHome, cacheAllocations, new Consumer<File>() {
-
- @Override
- public void accept(File directory) {
- cleanDirAsRoot(directory);
- }
-
- });
-
- login(logger);
-
- logger.log("Pulling image...") ;
- Commandline docker = getDocker();
- docker.addArgs("pull", jobContext.getEnvironment());
- docker.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
-
- docker.clearArgs();
- String dockerInstance = UUID.randomUUID().toString();
- docker.addArgs("run", "--rm", "--name", dockerInstance);
- for (Map.Entry<String, String> entry: jobContext.getEnvVars().entrySet())
- docker.addArgs("--env", entry.getKey() + "=" + entry.getValue());
- if (getRunOptions() != null)
- docker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
-
- String imageOS = getImageOS(logger, jobContext.getEnvironment());
- logger.log("Detected image OS: " + imageOS);
-
- boolean isWindows = imageOS.equals("windows");
-
- File workspaceCache = null;
- for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
- if (PathUtils.isCurrent(entry.getValue())) {
- workspaceCache = entry.getKey().getDirectory(hostCacheHome);
- break;
- }
- }
-
- File hostWorkspace;
- if (workspaceCache != null) {
- hostWorkspace = workspaceCache;
- } else {
- hostWorkspace = new File(hostCIHome, "workspace");
- FileUtils.createDir(hostWorkspace);
- }
-
- if (jobContext.isRetrieveSource()) {
- logger.log("Retrieving source code...");
- File tempHome = FileUtils.createTempDir();
- try {
- Map<String, String> environments = Maps.newHashMap("HOME", tempHome.getAbsolutePath());
- Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
- git.environments(environments).workingDir(hostWorkspace);
- LineConsumer logger = new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobContext.getLogger().log(line);
- }
-
- };
-
- git.addArgs("config", "--global", "credential.modalprompt", "false");
- git.execute(logger, logger).checkReturnCode();
-
- // clear credential.helper list to remove possible Windows credential manager
- git.clearArgs();
- if (SystemUtils.IS_OS_WINDOWS)
- git.addArgs("config", "--global", "credential.helper", "\"\"");
- else
- git.addArgs("config", "--global", "credential.helper", "");
- git.execute(logger, logger).checkReturnCode();
-
- git.clearArgs();
- git.addArgs("config", "--global", "--add", "credential.helper", "store");
- git.execute(logger, logger).checkReturnCode();
-
- git.clearArgs();
- git.addArgs("config", "--global", "credential.useHttpPath", "true");
- git.execute(logger, logger).checkReturnCode();
-
- List<String> trustCertContent = new ArrayList<>();
- ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
- File keystoreFile = serverConfig.getKeystoreFile();
- if (keystoreFile != null) {
- String password = serverConfig.getKeystorePassword();
- for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
- trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
- }
- if (serverConfig.getTrustCertsDir() != null) {
- for (File file: serverConfig.getTrustCertsDir().listFiles()) {
- if (file.isFile())
- trustCertContent.addAll(FileUtils.readLines(file));
- }
- }
-
- if (!trustCertContent.isEmpty()) {
- File trustCertFile = new File(tempHome, "trust-cert.pem");
- FileUtils.writeLines(trustCertFile, trustCertContent, "\n");
- git.clearArgs();
- git.addArgs("config", "--global", "http.sslCAInfo", trustCertFile.getAbsolutePath());
- git.execute(logger, logger).checkReturnCode();
- }
-
- if (!jobContext.getSubmoduleCredentials().isEmpty()) {
- List<String> submoduleCredentials = new ArrayList<>();
- for (SubmoduleCredential submoduleCredential: jobContext.getSubmoduleCredentials()) {
- String url = submoduleCredential.getUrl();
- String userName = URLEncoder.encode(submoduleCredential.getUserName(), Charsets.UTF_8.name());
- String password = URLEncoder.encode(submoduleCredential.getPasswordSecret(), Charsets.UTF_8.name());
- if (url.startsWith("http://")) {
- submoduleCredentials.add("http://" + userName + ":" + password
- + "@" + url.substring("http://".length()).replace(":", "%3a"));
- } else {
- submoduleCredentials.add("https://" + userName + ":" + password
- + "@" + url.substring("https://".length()).replace(":", "%3a"));
- }
- }
- FileUtils.writeLines(new File(tempHome, ".git-credentials"), submoduleCredentials, "\n");
- }
-
- if (!new File(hostWorkspace, ".git").exists()) {
- git.clearArgs();
- git.addArgs("init", ".");
- git.execute(logger, logger).checkReturnCode();
- }
-
- git.clearArgs();
- git.addArgs("fetch", jobContext.getProjectGitDir().getAbsolutePath(), "--force", "--quiet",
- "--depth=1", jobContext.getCommitId().name());
- git.execute(logger, logger).checkReturnCode();
-
- git.clearArgs();
- git.addArgs("checkout", "--quiet", jobContext.getCommitId().name());
- git.execute(logger, logger).checkReturnCode();
-
- // deinit submodules in case submodule url is changed
- git.clearArgs();
- git.addArgs("submodule", "deinit", "--all", "--force", "--quiet");
- git.execute(logger, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (!line.contains("error: could not lock config file") &&
- !line.contains("warning: Could not unset core.worktree setting in submodule")) {
- jobContext.getLogger().log(line);
- }
- }
-
- }).checkReturnCode();
-
- git.clearArgs();
- git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet", "--depth=1");
- git.execute(logger, logger).checkReturnCode();
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- FileUtils.deleteDir(tempHome);
- }
- }
-
- logger.log("Retrieving job dependencies...");
- try {
- FileUtils.copyDirectory(jobContext.getServerWorkspace(), hostWorkspace);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- String containerCIHome;
- String containerWorkspace;
- String[] containerCommand;
- if (isWindows) {
- containerCIHome = "C:\\onedev-ci";
- containerWorkspace = "C:\\onedev-ci\\workspace";
- containerCommand = new String[] {"cmd", "/c", "C:\\onedev-ci\\job-commands.bat"};
-
- File scriptFile = new File(hostCIHome, "job-commands.bat");
- try {
- FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\r\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- } else {
- containerCIHome = "/onedev-ci";
- containerWorkspace = "/onedev-ci/workspace";
- containerCommand = new String[] {"sh", "/onedev-ci/job-commands.sh"};
-
- File scriptFile = new File(hostCIHome, "job-commands.sh");
- try {
- FileUtils.writeLines(scriptFile, jobContext.getCommands(), "\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- docker.addArgs("-v", hostCIHome.getAbsolutePath() + ":" + containerCIHome);
- if (workspaceCache != null)
- docker.addArgs("-v", workspaceCache.getAbsolutePath() + ":" + containerWorkspace);
- for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {
- if (!PathUtils.isCurrent(entry.getValue())) {
- String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();
- String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());
- docker.addArgs("-v", hostCachePath + ":" + containerCachePath);
- }
- }
- if (SystemUtils.IS_OS_LINUX)
- docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
-
- docker.addArgs("-w", containerWorkspace, jobContext.getEnvironment());
- docker.addArgs(containerCommand);
-
- logger.log("Running container to execute job...");
-
- try {
- docker.execute(newJobLogger(logger), newJobLogger(logger), null, new ProcessKiller() {
-
- @Override
- public void kill(Process process, String executionId) {
- logger.log("Stopping container...");
- Commandline cmd = getDocker();
- cmd.addArgs("stop", dockerInstance);
- cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
- }
-
- }).checkReturnCode();
- } finally {
- logger.log("Sending job outcomes...");
-
- int baseLen = hostWorkspace.getAbsolutePath().length()+1;
- for (File file: jobContext.getCollectFiles().listFiles(hostWorkspace)) {
- try {
- FileUtils.copyFile(file, new File(jobContext.getServerWorkspace(), file.getAbsolutePath().substring(baseLen)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
- logger.log("Reporting job caches...");
-
- jobManager.reportJobCaches(jobToken, KubernetesHelper.getCacheInstances(hostCacheHome).keySet());
-
- return null;
- }
-
- });
- } finally {
- cleanDirAsRoot(hostCIHome);
- FileUtils.deleteDir(hostCIHome);
- }
- }
-
- private LineConsumer newJobLogger(JobLogger logger) {
- return new LineConsumer(Charsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- logger.log(line);
- }
-
- };
- }
-
- private LineConsumer newDebugLogger() {
- return new LineConsumer(Charsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- };
- }
-
- private void login(JobLogger logger) {
- for (RegistryLogin login: getRegistryLogins()) {
- if (login.getRegistryUrl() != null)
- logger.log(String.format("Login to docker registry '%s'...", login.getRegistryUrl()));
- else
- logger.log("Login to official docker registry...");
- Commandline cmd = getDocker();
- cmd.addArgs("login", "-u", login.getUserName(), "--password-stdin");
- if (login.getRegistryUrl() != null)
- cmd.addArgs(login.getRegistryUrl());
- ByteArrayInputStream input;
- try {
- input = new ByteArrayInputStream(login.getPassword().getBytes(Charsets.UTF_8.name()));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- cmd.execute(newDebugLogger(), newJobLogger(logger), input).checkReturnCode();
- }
- }
-
- private boolean hasOptions(String[] arguments, String... options) {
- for (String argument: arguments) {
- for (String option: options) {
- if (option.startsWith("--")) {
- if (argument.startsWith(option + "=") || argument.equals(option))
- return true;
- } else if (option.startsWith("-")) {
- if (argument.startsWith(option))
- return true;
- } else {
- throw new RuntimeException("Invalid option: " + option);
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- boolean isValid = true;
- Set<String> registryUrls = new HashSet<>();
- for (RegistryLogin login: getRegistryLogins()) {
- if (!registryUrls.add(login.getRegistryUrl())) {
- isValid = false;
- String message;
- if (login.getRegistryUrl() != null)
- message = "Duplicate login entry for registry '" + login.getRegistryUrl() + "'";
- else
- message = "Duplicate login entry for official registry";
- context.buildConstraintViolationWithTemplate(message)
- .addPropertyNode("registryLogins").addConstraintViolation();
- break;
- }
- }
- if (getRunOptions() != null) {
- String[] arguments = StringUtils.parseQuoteTokens(getRunOptions());
- String invalidOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty",
- "-i", "--interactive", "--rm", "--restart", "--name"};
- if (hasOptions(arguments, invalidOptions)) {
- StringBuilder errorMessage = new StringBuilder("Can not use options: "
- + Joiner.on(", ").join(invalidOptions));
- context.buildConstraintViolationWithTemplate(errorMessage.toString())
- .addPropertyNode("runOptions").addConstraintViolation();
- isValid = false;
- }
- }
- if (!isValid)
- context.disableDefaultConstraintViolation();
- return isValid;
- }
-
- @Override
- public void test(TestData testData, JobLogger logger) {
- login(logger);
-
- logger.log("Pulling image...");
-
- Commandline cmd = getDocker();
- cmd.addArgs("pull", testData.getDockerImage());
- cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();
-
- boolean windows = getImageOS(logger, testData.getDockerImage()).equals("windows");
-
- logger.log("Running container...");
- File workspaceDir = null;
- File cacheDir = null;
- try {
- workspaceDir = Bootstrap.createTempDir("workspace");
- cacheDir = new File(getCacheHome(), UUID.randomUUID().toString());
- FileUtils.createDir(cacheDir);
-
- cmd.clearArgs();
- cmd.addArgs("run", "--rm");
- if (getRunOptions() != null)
- cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
- String containerWorkspacePath;
- String containerCachePath;
- if (windows) {
- containerWorkspacePath = "C:\\onedev-ci\\workspace";
- containerCachePath = "C:\\onedev-ci\\cache";
- } else {
- containerWorkspacePath = "/onedev-ci/workspace";
- containerCachePath = "/onedev-ci/cache";
- }
- cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + containerWorkspacePath);
- cmd.addArgs("-v", cacheDir.getAbsolutePath() + ":" + containerCachePath);
-
- cmd.addArgs("-w", containerWorkspacePath);
- cmd.addArgs(testData.getDockerImage());
-
- if (windows)
- cmd.addArgs("cmd", "/c", "echo hello from container");
- else
- cmd.addArgs("sh", "-c", "echo hello from container");
-
- cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();
- } finally {
- if (workspaceDir != null)
- FileUtils.deleteDir(workspaceDir);
- if (cacheDir != null)
- FileUtils.deleteDir(cacheDir);
- }
-
- if (!SystemUtils.IS_OS_WINDOWS) {
- logger.log("Checking busybox...");
- cmd = getDocker();
- cmd.addArgs("run", "--rm", "busybox", "sh", "-c", "echo hello from busybox");
- cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();
- }
- }
-
- public void cleanDirAsRoot(File dir) {
- if (SystemUtils.IS_OS_WINDOWS) {
- FileUtils.cleanDir(dir);
- } else {
- Commandline cmd = getDocker();
- String containerPath = "/dir-to-clean";
- cmd.addArgs("run", "-v", dir.getAbsolutePath() + ":" + containerPath, "--rm",
- "busybox", "sh", "-c", "rm -rf " + containerPath + "/*");
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
- }
- }
-
- @Editable(name="Specify a Docker Image to Test Against")
- public static class TestData implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String dockerImage;
-
- @Editable
- @OmitName
- @NotEmpty
- public String getDockerImage() {
- return dockerImage;
- }
-
- public void setDockerImage(String dockerImage) {
- this.dockerImage = dockerImage;
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 88ecc0bbe1..27af3bb371 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -17,52 +17,52 @@
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-artifact</artifactId>
+ <artifactId>server-plugin-outcome-artifact</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-htmlreport</artifactId>
+ <artifactId>server-plugin-outcome-htmlreport</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-maven</artifactId>
+ <artifactId>server-plugin-cispec-maven</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-node</artifactId>
+ <artifactId>server-plugin-cispec-node</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-laravel</artifactId>
+ <artifactId>server-plugin-cispec-laravel</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-rubyonrails</artifactId>
+ <artifactId>server-plugin-cispec-rubyonrails</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-django</artifactId>
+ <artifactId>server-plugin-cispec-django</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-gradle</artifactId>
+ <artifactId>server-plugin-cispec-gradle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-kubernetes</artifactId>
+ <artifactId>server-plugin-executor-kubernetes</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-serverdocker</artifactId>
+ <artifactId>server-plugin-executor-docker</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>