The Unified and Autonomous Development Platform
Windows support for image build
Robin Shen4a0fc5f4e9b0
diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 21a14002a3..9b9ff9dddd 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -44,10 +44,6 @@<groupId>io.onedev</groupId><artifactId>commons-jsyntax</artifactId></dependency>- <dependency>- <groupId>commons-codec</groupId>- <artifactId>commons-codec</artifactId>- </dependency><dependency><groupId>org.apache.commons</groupId><artifactId>commons-compress</artifactId>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex b6a6c18db8..f9dbedad35 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -74,11 +74,13 @@ import com.thoughtworks.xstream.core.JVM;import com.thoughtworks.xstream.mapper.MapperWrapper;import com.vladsch.flexmark.Extension;+import io.onedev.agent.ExecutorUtils;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AbstractPlugin;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;+import io.onedev.k8shelper.OsInfo;import io.onedev.server.buildspec.job.DefaultJobManager;import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.log.instruction.LogInstruction;@@ -462,6 +464,15 @@ public class CoreModule extends AbstractPluginModule {}).in(Singleton.class);+ bind(OsInfo.class).toProvider(new Provider<OsInfo>() {++ @Override+ public OsInfo get() {+ return ExecutorUtils.getOsInfo();+ }++ }).in(Singleton.class);+bind(ForkJoinPool.class).toInstance(new ForkJoinPool() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.javaindex c7f4c6ccbe..adde3f7f4c 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java@@ -1,16 +1,28 @@package io.onedev.server.buildspec.step;+import java.util.ArrayList;+import java.util.List;+import java.util.Map;+import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;-import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;+import io.onedev.k8shelper.CommandExecutable;+import io.onedev.k8shelper.Executable;+import io.onedev.k8shelper.KubernetesHelper;+import io.onedev.k8shelper.OsExecution;+import io.onedev.k8shelper.OsInfo;+import io.onedev.k8shelper.OsMatcher;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.model.Build;import io.onedev.server.model.support.RegistryLogin;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;@Editable(order=160, name="Build/Publish Docker Image")-public class BuildImageStep extends CommandStep {+public class BuildImageStep extends Step {private static final long serialVersionUID = 1L;@@ -24,6 +36,8 @@ public class BuildImageStep extends CommandStep {private boolean publish;+ private boolean useTTY;+@Editable(order=100, description="Optionally specify build path relative to <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. "+ "Leave empty to use job workspace itself")@Interpolative(variableSuggester="suggestVariables")@@ -46,7 +60,7 @@ public class BuildImageStep extends CommandStep {this.dockerfile = dockerfile;}- @Editable(order=300, description="Specify tags of built image. Multiple tags should be separated with space")+ @Editable(order=300, description="Name and optionally a tag in the 'name:tag' format. Multiple tags should be separated with space")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getTags() {@@ -75,20 +89,21 @@ public class BuildImageStep extends CommandStep {this.publish = publish;}- @Override- public String getImage() {- return "docker";+ @Editable(order=10000, name="Enable TTY Mode", description=CommandStep.USE_TTY_HELP)+ public boolean isUseTTY() {+ return useTTY;}- @Editable- @Override- public boolean isRunInContainer() {- return true;+ public void setUseTTY(boolean useTTY) {+ this.useTTY = useTTY;}- @Override- public Interpreter getInterpreter() {- DefaultInterpreter interpreter = new DefaultInterpreter();+ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, false, false);+ }++ private List<String> getNonWindowsCommands() {+ List<String> commands = new ArrayList<>();StringBuilder buildCommand = new StringBuilder("docker build ");String[] parsedTags = StringUtils.parseQuoteTokens(getTags());@@ -106,7 +121,7 @@ public class BuildImageStep extends CommandStep {elsebuildCommand.append("$workspace");- interpreter.getCommands().add("set -e");+ commands.add("set -e");if (getLogin() != null) {StringBuilder loginCommand = new StringBuilder("echo ");@@ -114,18 +129,86 @@ public class BuildImageStep extends CommandStep {loginCommand.append(getLogin().getUserName()).append(" --password-stdin");if (getLogin().getRegistryUrl() != null)loginCommand.append(" ").append(getLogin().getRegistryUrl());- interpreter.getCommands().add(loginCommand.toString());+ commands.add(loginCommand.toString());}- interpreter.getCommands().add("workspace=$(pwd)");- interpreter.getCommands().add(buildCommand.toString());+ commands.add("workspace=$(pwd)");+ commands.add(buildCommand.toString());if (isPublish()) {for (String tag: parsedTags)- interpreter.getCommands().add("docker push " + tag);+ commands.add("docker push " + tag);}- return interpreter;+ return commands;+ }++ private List<String> getWindowsCommands() {+ List<String> commands = new ArrayList<>();++ StringBuilder buildCommand = new StringBuilder("docker build ");+ String[] parsedTags = StringUtils.parseQuoteTokens(getTags());+ for (String tag: parsedTags)+ buildCommand.append("-t ").append(tag).append(" ");+ if (getDockerfile() != null)+ buildCommand.append("-f ").append("%workspace%\\" + getDockerfile().replace('/', '\\'));+ else+ buildCommand.append("-f ").append("%workspace%\\Dockerfile");++ buildCommand.append(" ");++ if (getBuildPath() != null)+ buildCommand.append("%workspace%\\" + getBuildPath().replace('/', '\\'));+ else+ buildCommand.append("%workspace%");++ buildCommand.append(" || exit /b 1");++ commands.add("@echo off");++ if (getLogin() != null) {+ StringBuilder loginCommand = new StringBuilder("echo ");+ loginCommand.append(getLogin().getPassword()).append("|docker login -u ");+ loginCommand.append(getLogin().getUserName()).append(" --password-stdin || exit /b 1");+ if (getLogin().getRegistryUrl() != null)+ loginCommand.append(" ").append(getLogin().getRegistryUrl());+ commands.add(loginCommand.toString());+ }++ commands.add("set workspace=%cd%");+ commands.add(buildCommand.toString());++ if (isPublish()) {+ for (String tag: parsedTags)+ commands.add("docker push " + tag + " || exit /b 1");+ }++ return commands;+ }++ @Override+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {+ List<OsExecution> executions = new ArrayList<>();+ String imageVersion = KubernetesHelper.getVersion();++ String image = KubernetesHelper.IMAGE_REPO_PREFIX + "-linux:" + imageVersion;+ executions.add(new OsExecution(OsMatcher.NON_WINDOWS, image, getNonWindowsCommands()));++ List<String> commands = getWindowsCommands();+ for (Map.Entry<Integer, String> entry: OsInfo.WINDOWS_VERSIONS.entrySet()) {+ OsMatcher osMatcher = new OsMatcher("(?i).*windows.*", ".*\\." + entry.getKey(), ".*");+ image = KubernetesHelper.IMAGE_REPO_PREFIX+ + "-windows-" + entry.getValue().toLowerCase()+ + ":" + imageVersion;+ executions.add(new OsExecution(osMatcher, image, commands));+ }++ OsMatcher osMatcher = new OsMatcher("(?i).*windows.*", ".*", ".*");+ String windowsImage = KubernetesHelper.IMAGE_REPO_PREFIX+ + "-windows-1809" + ":" + imageVersion;+ executions.add(new OsExecution(osMatcher, windowsImage, commands));++ return new CommandExecutable(executions, isUseTTY());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex a39f04d10b..60e0369228 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -22,6 +22,11 @@ import io.onedev.server.web.editable.annotation.ShowCondition;public class CommandStep extends Step {private static final long serialVersionUID = 1L;++ public static final String USE_TTY_HELP = "Many commands print outputs with ANSI colors in "+ + "TTY mode to help identifying problems easily. However some commands running in this mode may "+ + "wait for user input to cause build hanging. This can normally be fixed by adding extra options "+ + "to the command";private boolean runInContainer = true;@@ -67,10 +72,7 @@ public class CommandStep extends Step {this.interpreter = interpreter;}- @Editable(order=10000, name="Enable TTY Mode", description="Many commands print outputs with ANSI colors in "- + "TTY mode to help identifying problems easily. However some commands running in this mode may "- + "wait for user input to cause build hanging. This can normally be fixed by adding extra options "- + "to the command")+ @Editable(order=10000, name="Enable TTY Mode", description=USE_TTY_HELP)@ShowCondition("isRunInContainerEnabled")public boolean isUseTTY() {return useTTY;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex 080f2b06be..4416752153 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -67,7 +67,7 @@ public class RunContainerStep extends Step {}@Editable(order=200, name="Working Directory", description="Optionally specify working directory of the container. "- + "Leave empty to use the default working directory (<tt>/onedev-build/workspace</tt>). "+ + "Leave empty to use the default working directory. "+ "<a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>Job workspace</a> will be "+ "mounted to the working directory so that the container can access job files")@Nullablediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.javaindex a4f3198b3c..a48515c6a2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java@@ -27,6 +27,8 @@ public interface AgentManager extends EntityManager<Agent> {Collection<Long> getOnlineAgentIds();+ List<String> getOsNames();+List<String> getOsArchs();List<Agent> query(EntityQuery<Agent> agentQuery, int firstResult, int maxResults);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.javaindex 6df686d6d1..b238cb1c6f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java@@ -21,6 +21,7 @@ import javax.persistence.criteria.Root;import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.util.collections.ConcurrentHashSet;import org.eclipse.jetty.websocket.api.Session;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -45,6 +46,7 @@ import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Agent;import io.onedev.server.model.AgentAttribute;import io.onedev.server.model.AgentToken;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;@@ -66,22 +68,27 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Ageprivate final ListenerRegistry listenerRegistry;+ private final TransactionManager transactionManager;+private final String agentVersion;private final Collection<String> agentLibs;private final Map<Long, Session> agentSessions = new ConcurrentHashMap<>();- private final Set<String> osArchs = new HashSet<>();+ private final Set<String> osNames = new ConcurrentHashSet<>();++ private final Set<String> osArchs = new ConcurrentHashSet<>();@Injectpublic DefaultAgentManager(Dao dao, AgentAttributeManager attributeManager, AgentTokenManager tokenManager,- ListenerRegistry listenerRegistry) {+ ListenerRegistry listenerRegistry, TransactionManager transactionManager) {super(dao);this.attributeManager = attributeManager;this.tokenManager = tokenManager;this.listenerRegistry = listenerRegistry;+ this.transactionManager = transactionManager;Properties props = new Properties();agentLibs = new HashSet<>();@@ -101,9 +108,12 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age@Sessional@Listenpublic void on(SystemStarted event) {- Query<String> query = dao.getSession().createQuery(String.format("select %s from Agent", Agent.PROP_OS_ARCH));- for (String osArch: query.list())- osArchs.add(osArch);+ Query<Object[]> query = dao.getSession().createQuery(String.format("select %s, %s from Agent",+ Agent.PROP_OS_NAME, Agent.PROP_OS_ARCH));+ for (Object[] row: query.list()) {+ osNames.add((String) row[0]);+ osArchs.add((String) row[1]);+ }}@Override@@ -139,9 +149,9 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Agethrow new ExplicitException("Name '" + data.getName() + "' already used by another agent");agent = new Agent();agent.setToken(token);- agent.setOs(data.getOs());- agent.setOsVersion(data.getOsVersion());- agent.setOsArch(data.getOsArch());+ agent.setOsName(data.getOsInfo().getOsName());+ agent.setOsVersion(data.getOsInfo().getOsVersion());+ agent.setOsArch(data.getOsInfo().getOsArch());agent.setName(data.getName());agent.setCpu(data.getCpu());agent.setMemory(data.getMemory());@@ -161,9 +171,9 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Ageif (agentWithSameName != null && !agentWithSameName.equals(agent))throw new ExplicitException("Name '" + data.getName() + "' already used by another agent");agent.setName(data.getName());- agent.setOs(data.getOs());- agent.setOsVersion(data.getOsVersion());- agent.setOsArch(data.getOsArch());+ agent.setOsName(data.getOsInfo().getOsName());+ agent.setOsVersion(data.getOsInfo().getOsVersion());+ agent.setOsArch(data.getOsInfo().getOsArch());agent.setIpAddress(session.getRemoteAddress().getAddress().getHostAddress());agent.setCpu(data.getCpu());agent.setMemory(data.getMemory());@@ -197,7 +207,16 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Age@Overridepublic void save(Agent agent) {super.save(agent);- osArchs.add(agent.getOsArch());++ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ osNames.add(agent.getOsName());+ osArchs.add(agent.getOsArch());+ }++ });}@Transactional@@ -233,6 +252,14 @@ public class DefaultAgentManager extends BaseEntityManager<Agent> implements Agereturn agentSessions.keySet();}+ @Sessional+ @Override+ public List<String> getOsNames() {+ List<String> osNames = new ArrayList<>(this.osNames);+ Collections.sort(osNames);+ return osNames;+ }+@Sessional@Overridepublic List<String> getOsArchs() {diff --git a/server-core/src/main/java/io/onedev/server/model/Agent.java b/server-core/src/main/java/io/onedev/server/model/Agent.javaindex a4f7bc3bca..dee7f6b8ab 100644--- a/server-core/src/main/java/io/onedev/server/model/Agent.java+++ b/server-core/src/main/java/io/onedev/server/model/Agent.java@@ -1,13 +1,13 @@package io.onedev.server.model;+import static io.onedev.server.model.Agent.PROP_CPU;import static io.onedev.server.model.Agent.PROP_IP_ADDRESS;import static io.onedev.server.model.Agent.PROP_LAST_USED_DATE;+import static io.onedev.server.model.Agent.PROP_MEMORY;import static io.onedev.server.model.Agent.PROP_NAME;-import static io.onedev.server.model.Agent.PROP_OS;+import static io.onedev.server.model.Agent.PROP_OS_NAME;import static io.onedev.server.model.Agent.PROP_OS_ARCH;import static io.onedev.server.model.Agent.PROP_OS_VERSION;-import static io.onedev.server.model.Agent.PROP_CPU;-import static io.onedev.server.model.Agent.PROP_MEMORY;import static io.onedev.server.model.Agent.PROP_PAUSED;import java.util.ArrayList;@@ -35,7 +35,7 @@ import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.agent.AgentData;-import io.onedev.agent.AgentOs;+import io.onedev.k8shelper.OsInfo;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.AgentManager;import io.onedev.server.job.resource.ResourceHolder;@@ -45,7 +45,7 @@ import io.onedev.server.util.CollectionUtils;@Table(indexes={@Index(columnList="o_token_id"), @Index(columnList=PROP_IP_ADDRESS),@Index(columnList=PROP_PAUSED), @Index(columnList=PROP_NAME),- @Index(columnList=PROP_OS), @Index(columnList=PROP_OS_VERSION),+ @Index(columnList=PROP_OS_NAME), @Index(columnList=PROP_OS_VERSION),@Index(columnList=PROP_CPU), @Index(columnList=PROP_MEMORY),@Index(columnList=PROP_OS_ARCH), @Index(columnList=PROP_LAST_USED_DATE)})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -67,9 +67,9 @@ public class Agent extends AbstractEntity {public static final String PROP_IP_ADDRESS = "ipAddress";- public static final String NAME_OS = "Os";+ public static final String NAME_OS_NAME = "Os";- public static final String PROP_OS = "os";+ public static final String PROP_OS_NAME = "osName";public static final String NAME_OS_VERSION = "Os Version";@@ -90,15 +90,15 @@ public class Agent extends AbstractEntity {public static final String PROP_LAST_USED_DATE = "lastUsedDate";public static final Set<String> ALL_FIELDS = Sets.newHashSet(- NAME_NAME, NAME_IP_ADDRESS, NAME_OS, NAME_OS_VERSION, NAME_OS_ARCH, NAME_CPU, NAME_MEMORY);+ NAME_NAME, NAME_IP_ADDRESS, NAME_OS_NAME, NAME_OS_VERSION, NAME_OS_ARCH, NAME_CPU, NAME_MEMORY);public static final List<String> QUERY_FIELDS = Lists.newArrayList(- NAME_NAME, NAME_IP_ADDRESS, NAME_OS, NAME_OS_VERSION, NAME_OS_ARCH, NAME_CPU, NAME_MEMORY);+ NAME_NAME, NAME_IP_ADDRESS, NAME_OS_NAME, NAME_OS_VERSION, NAME_OS_ARCH, NAME_CPU, NAME_MEMORY);public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(NAME_NAME, PROP_NAME,NAME_IP_ADDRESS, PROP_IP_ADDRESS,- NAME_OS, PROP_OS,+ NAME_OS_NAME, PROP_OS_NAME,NAME_OS_VERSION, PROP_OS_VERSION,NAME_OS_ARCH, PROP_OS_ARCH,NAME_CPU, PROP_CPU,@@ -121,7 +121,7 @@ public class Agent extends AbstractEntity {private String ipAddress;@Column(nullable=false)- private AgentOs os;+ private String osName;@Column(nullable=false)private String osVersion;@@ -155,12 +155,12 @@ public class Agent extends AbstractEntity {this.name = name;}- public AgentOs getOs() {- return os;+ public String getOsName() {+ return osName;}- public void setOs(AgentOs os) {- this.os = os;+ public void setOsName(String osName) {+ this.osName = osName;}public String getOsVersion() {@@ -248,7 +248,8 @@ public class Agent extends AbstractEntity {}public AgentData getAgentData() {- return new AgentData(getToken().getValue(), os, osVersion, osArch, name, cpu, memory, getAttributeMap());+ return new AgentData(getToken().getValue(), new OsInfo(osName, osVersion, osArch),+ name, cpu, memory, getAttributeMap());}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.javaindex 27609c00f3..da21667f8f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java@@ -6,7 +6,6 @@ import java.util.List;import javax.annotation.Nullable;-import io.onedev.agent.AgentOs;import io.onedev.server.model.support.NamedAgentQuery;import io.onedev.server.search.entity.agent.AgentQuery;import io.onedev.server.search.entity.agent.NotUsedSinceCriteria;@@ -22,10 +21,10 @@ public class AgentSetting implements Serializable {namedQueries.add(new NamedAgentQuery("All agents", null));namedQueries.add(new NamedAgentQuery("Online agents", "online"));namedQueries.add(new NamedAgentQuery("Offline agents", "offline"));- namedQueries.add(new NamedAgentQuery("Linux agents", new AgentQuery(new OsCriteria(AgentOs.LINUX)).toString()));- namedQueries.add(new NamedAgentQuery("Windows agents", new AgentQuery(new OsCriteria(AgentOs.WINDOWS)).toString()));- namedQueries.add(new NamedAgentQuery("Mac OS X agents", new AgentQuery(new OsCriteria(AgentOs.MACOSX)).toString()));- namedQueries.add(new NamedAgentQuery("FreeBSD agents", new AgentQuery(new OsCriteria(AgentOs.FREEBSD)).toString()));+ namedQueries.add(new NamedAgentQuery("Linux agents", new AgentQuery(new OsCriteria("Linux")).toString()));+ namedQueries.add(new NamedAgentQuery("Windows agents", new AgentQuery(new OsCriteria("Windows")).toString()));+ namedQueries.add(new NamedAgentQuery("Mac OS X agents", new AgentQuery(new OsCriteria("Mac OS X")).toString()));+ namedQueries.add(new NamedAgentQuery("FreeBSD agents", new AgentQuery(new OsCriteria("FreeBSD")).toString()));namedQueries.add(new NamedAgentQuery("Paused agents", "paused"));namedQueries.add(new NamedAgentQuery("Not used for 1 month", new AgentQuery(new NotUsedSinceCriteria("1 month ago")).toString()));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.javaindex 9486e06521..5382324e1f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java@@ -4,7 +4,7 @@ import static io.onedev.server.model.Agent.NAME_CPU;import static io.onedev.server.model.Agent.NAME_IP_ADDRESS;import static io.onedev.server.model.Agent.NAME_MEMORY;import static io.onedev.server.model.Agent.NAME_NAME;-import static io.onedev.server.model.Agent.NAME_OS;+import static io.onedev.server.model.Agent.NAME_OS_NAME;import static io.onedev.server.model.Agent.NAME_OS_ARCH;import static io.onedev.server.model.Agent.NAME_OS_VERSION;import static io.onedev.server.model.Agent.ORDER_FIELDS;@@ -24,7 +24,6 @@ import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import io.onedev.agent.AgentOs;import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;@@ -147,8 +146,8 @@ public class AgentQuery extends EntityQuery<Agent> {switch (fieldName) {case NAME_NAME:return new NameCriteria(value);- case NAME_OS:- return new OsCriteria(AgentOs.valueOf(value.toUpperCase()));+ case NAME_OS_NAME:+ return new OsCriteria(value);case NAME_OS_VERSION:return new OsVersionCriteria(value);case NAME_OS_ARCH:diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.javaindex eb6112ea7a..ab108cbce1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java@@ -5,7 +5,6 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;-import io.onedev.agent.AgentOs;import io.onedev.server.model.Agent;import io.onedev.server.util.criteria.Criteria;@@ -13,27 +12,27 @@ public class OsCriteria extends Criteria<Agent> {private static final long serialVersionUID = 1L;- private AgentOs value;+ private String value;- public OsCriteria(AgentOs value) {+ public OsCriteria(String value) {this.value = value;}@Overridepublic Predicate getPredicate(CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {- return builder.equal(from.get(Agent.PROP_OS), value);+ return builder.equal(from.get(Agent.PROP_OS_NAME), value);}@Overridepublic boolean matches(Agent agent) {- return agent.getOs() == value;+ return agent.getOsName().equals(value);}@Overridepublic String toStringWithoutParens() {- return quote(Agent.NAME_OS) + " "+ return quote(Agent.NAME_OS_NAME) + " "+ AgentQuery.getRuleName(AgentQueryLexer.Is) + " "- + quote(value.name());+ + quote(value);}}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.javaindex 5e40de5411..9463b56d2c 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java@@ -8,7 +8,6 @@ import org.apache.commons.lang3.StringUtils;import com.google.common.base.Optional;import com.google.common.base.Preconditions;-import io.onedev.agent.AgentOs;import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;@@ -74,18 +73,14 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());try {AgentQuery.checkField(fieldName, operator);- if (fieldName.equals(Agent.NAME_OS)) {- List<String> osNames = new ArrayList<>();- for (AgentOs each: AgentOs.values())- osNames.add(each.name());- return SuggestionUtils.suggest(osNames, matchWith);- } else if (fieldName.equals(Agent.NAME_NAME)) {+ if (fieldName.equals(Agent.NAME_OS_NAME))+ return SuggestionUtils.suggest(OneDev.getInstance(AgentManager.class).getOsNames(), matchWith);+ else if (fieldName.equals(Agent.NAME_NAME))return SuggestionUtils.suggestAgents(matchWith);- } else if (fieldName.equals(Agent.NAME_OS_ARCH)) {+ else if (fieldName.equals(Agent.NAME_OS_ARCH))return SuggestionUtils.suggest(OneDev.getInstance(AgentManager.class).getOsArchs(), matchWith);- } else {+ elsereturn null;- }} catch (ExplicitException ex) {}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentIcon.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentIcon.javanew file mode 100644index 0000000000..7fb9914323--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentIcon.java@@ -0,0 +1,42 @@+package io.onedev.server.web.page.admin.buildsetting.agent;++import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.model.Agent;+import io.onedev.server.web.component.svg.SpriteImage;++@SuppressWarnings("serial")+public class AgentIcon extends SpriteImage {++ private final IModel<Agent> agentModel;++ public AgentIcon(String id, IModel<Agent> agentModel) {+ super(id, new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ String osName = agentModel.getObject().getOsName().toLowerCase();+ if (osName.contains("windows"))+ return "windows";+ else if (osName.contains("linux"))+ return "linux";+ else if (osName.contains("mac"))+ return "macosx";+ else if (osName.contains("freebsd"))+ return "freebsd";+ else+ return "computer";+ }++ });+ this.agentModel = agentModel;+ }++ @Override+ protected void onDetach() {+ agentModel.detach();+ super.onDetach();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.javaindex 5c3ee82e1a..3e49f5fcb6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java@@ -63,7 +63,6 @@ import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;-import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -837,7 +836,7 @@ class AgentListPanel extends Panel {Agent agent = rowModel.getObject();Link<Void> link = new BookmarkablePageLink<Void>("link",AgentOverviewPage.class, AgentOverviewPage.paramsOf(agent));- link.add(new SpriteImage("icon", agent.getOs().getIcon()));+ link.add(new AgentIcon("icon", rowModel));link.add(new Label("label", agent.getName()));fragment.add(link);cellItem.add(fragment);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.javaindex 1a2621acab..d4f7a45290 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java@@ -22,7 +22,6 @@ import io.onedev.server.entitymanager.AgentAttributeManager;import io.onedev.server.entitymanager.AgentManager;import io.onedev.server.model.AgentAttribute;import io.onedev.server.web.component.AgentStatusBadge;-import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.util.ConfirmClickModifier;@@ -83,7 +82,7 @@ public class AgentOverviewPage extends AgentDetailPage {});- add(new SpriteImage("icon", getAgent().getOs().getIcon()));+ add(new AgentIcon("icon", agentModel));add(new Label("name", getAgent().getName()));add(new Label("ipAddress", getAgent().getIpAddress()));diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 6073ab9a02..5c720b3fe0 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -1,14 +1,15 @@package io.onedev.server.plugin.executor.kubernetes;import static io.onedev.k8shelper.KubernetesHelper.ENV_JOB_TOKEN;+import static io.onedev.k8shelper.KubernetesHelper.ENV_OS_INFO;import static io.onedev.k8shelper.KubernetesHelper.ENV_SERVER_URL;+import static io.onedev.k8shelper.KubernetesHelper.IMAGE_REPO_PREFIX;import static io.onedev.k8shelper.KubernetesHelper.LOG_END_MESSAGE;import static io.onedev.k8shelper.KubernetesHelper.stringifyPosition;import java.io.ByteArrayOutputStream;import java.io.File;import java.io.IOException;-import java.io.InputStream;import java.io.Serializable;import java.nio.charset.StandardCharsets;import java.time.Instant;@@ -29,8 +30,10 @@ import java.util.concurrent.atomic.AtomicReference;import javax.annotation.Nullable;import org.apache.commons.codec.binary.Base64;-import org.apache.commons.io.IOUtils;+import org.apache.commons.codec.binary.Hex;+import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.SystemUtils;+import org.apache.commons.text.WordUtils;import org.hibernate.validator.constraints.NotEmpty;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -61,6 +64,9 @@ import io.onedev.k8shelper.ExecuteCondition;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.k8shelper.LeafExecutable;import io.onedev.k8shelper.LeafVisitor;+import io.onedev.k8shelper.OsContainer;+import io.onedev.k8shelper.OsExecution;+import io.onedev.k8shelper.OsInfo;import io.onedev.server.OneDev;import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.EnvVar;@@ -335,7 +341,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataprivate OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, TaskLogger jobLogger) {Commandline kubectl = newKubeCtl();- kubectl.addArgs("get", "nodes", "-o", "jsonpath={range .items[*]}{.status.nodeInfo.operatingSystem} {.status.nodeInfo.kernelVersion} {.spec.unschedulable}{'|'}{end}");+ kubectl.addArgs("get", "nodes", "-o", "jsonpath={range .items[*]}{.status.nodeInfo.operatingSystem} {.status.nodeInfo.kernelVersion} {.status.nodeInfo.architecture} {.spec.unschedulable}{'|'}{end}");for (NodeSelectorEntry entry: nodeSelector)kubectl.addArgs("-l", entry.getLabelName() + "=" + entry.getLabelValue());@@ -354,8 +360,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatafor (String osInfoString: Splitter.on('|').trimResults().omitEmptyStrings().splitToList(baos.toString())) {osInfoString = osInfoString.replace('\n', ' ').replace('\r', ' ');List<String> fields = Splitter.on(' ').omitEmptyStrings().trimResults().splitToList(osInfoString);- if (fields.size() == 2 || fields.get(2).equals("false"))- osInfos.add(new OsInfo(fields.get(0), fields.get(1)));+ if (fields.size() == 3 || fields.get(3).equals("false")) {+ String osName = WordUtils.capitalize(fields.get(0));+ String osVersion = fields.get(1);+ if (osName.equals("Windows"))+ osVersion = StringUtils.substringBeforeLast(osVersion, ".");+ osInfos.add(new OsInfo(osName, osVersion, fields.get(2)));+ }}if (!osInfos.isEmpty()) {@@ -690,7 +701,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataString trustCertsConfigMapName = createTrustCertsConfigMap(namespace, jobLogger);- OsInfo baselineOsInfo = getBaselineOsInfo(getNodeSelector(), jobLogger);+ OsInfo osInfo = getBaselineOsInfo(getNodeSelector(), jobLogger);Map<String, Object> podSpec = new LinkedHashMap<>();@@ -703,7 +714,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataString trustCertsHome;String dockerSock;String containerdSock;- if (baselineOsInfo.isWindows()) {+ if (osInfo.isWindows()) {containerBuildHome = "C:\\onedev-build";containerCacheHome = containerBuildHome + "\\cache";containerCommandHome = containerBuildHome + "\\command";@@ -747,7 +758,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"mountPath", containerdSock);List<Object> commonVolumeMounts = Lists.<Object>newArrayList(buildHomeMount, authInfoMount, cacheHomeMount);- if (baselineOsInfo.isWindows())+ if (osInfo.isWindows())commonVolumeMounts.add(authInfoMount2);if (trustCertsConfigMapName != null)commonVolumeMounts.add(trustCertsMount);@@ -767,15 +778,19 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataList<String> containerNames = Lists.newArrayList("init");- String helperImageVersion;- try (InputStream is = KubernetesExecutor.class.getClassLoader().getResourceAsStream("k8s-helper-version.properties")) {- ByteArrayOutputStream baos = new ByteArrayOutputStream();- IOUtils.copy(is, baos);- helperImageVersion = baos.toString();- } catch (IOException e) {- throw new RuntimeException(e);+ String helperImageSuffix;+ if (osInfo.isWindows()) {+ String windowsVersion = OsInfo.WINDOWS_VERSIONS.get(osInfo.getWindowsBuild());+ if (windowsVersion != null)+ helperImageSuffix = "windows-" + windowsVersion.toLowerCase();+ else+ throw new ExplicitException("Unsupported windows build number: " + osInfo.getWindowsBuild());+ } else {+ helperImageSuffix = "linux";}+ String helperImage = IMAGE_REPO_PREFIX + "-" + helperImageSuffix + ":" + KubernetesHelper.getVersion();+List<Map<Object, Object>> commonEnvs = new ArrayList<>();commonEnvs.add(CollectionUtils.newLinkedHashMap("name", ENV_SERVER_URL,@@ -783,6 +798,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatacommonEnvs.add(CollectionUtils.newLinkedHashMap("name", ENV_JOB_TOKEN,"value", jobToken));+ commonEnvs.add(CollectionUtils.newLinkedHashMap(+ "name", ENV_OS_INFO,+ "value", Hex.encodeHexString(SerializationUtils.serialize(osInfo))+ ));entryExecutable.traverse(new LeafVisitor<Void>() {@@ -793,35 +812,37 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataMap<Object, Object> stepContainerSpec;if (executable instanceof CommandExecutable) {CommandExecutable commandExecutable = (CommandExecutable) executable;- if (commandExecutable.getImage() == null) {+ OsExecution execution = commandExecutable.getExecution(osInfo);+ if (execution.getImage() == null) {throw new ExplicitException("This step can only be executed by server shell "+ "executor or remote shell executor");}stepContainerSpec = CollectionUtils.newHashMap("name", containerName,- "image", commandExecutable.getImage());+ "image", execution.getImage());if (commandExecutable.isUseTTY())stepContainerSpec.put("tty", true);stepContainerSpec.put("volumeMounts", commonVolumeMounts);stepContainerSpec.put("env", commonEnvs);} else if (executable instanceof ContainerExecutable) {ContainerExecutable containerExecutable = (ContainerExecutable) executable;+ OsContainer container = containerExecutable.getContainer(osInfo);stepContainerSpec = CollectionUtils.newHashMap("name", containerName,- "image", containerExecutable.getImage());+ "image", container.getImage());if (containerExecutable.isUseTTY())stepContainerSpec.put("tty", true);List<Object> volumeMounts = new ArrayList<>(commonVolumeMounts);- if (containerExecutable.getWorkingDir() != null) {+ if (container.getWorkingDir() != null) {volumeMounts.add(CollectionUtils.newLinkedHashMap("name", "build-home",- "mountPath", containerExecutable.getWorkingDir(),+ "mountPath", container.getWorkingDir(),"subPath", "workspace"));}stepContainerSpec.put("volumeMounts", volumeMounts);List<Map<Object, Object>> envs = new ArrayList<>(commonEnvs);- for (Map.Entry<String, String> entry: containerExecutable.getEnvMap().entrySet()) {+ for (Map.Entry<String, String> entry: container.getEnvMap().entrySet()) {envs.add(CollectionUtils.newLinkedHashMap("name", entry.getKey(),"value", entry.getValue()));@@ -830,13 +851,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData} else {stepContainerSpec = CollectionUtils.newHashMap("name", containerName,- "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion);+ "image", helperImage);stepContainerSpec.put("volumeMounts", commonVolumeMounts);stepContainerSpec.put("env", commonEnvs);}String positionStr = stringifyPosition(position);- if (baselineOsInfo.isLinux()) {+ if (osInfo.isLinux()) {stepContainerSpec.put("command", Lists.newArrayList("sh"));stepContainerSpec.put("args", Lists.newArrayList(containerCommandHome + "/" + positionStr + ".sh"));} else {@@ -852,7 +873,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}, new ArrayList<>());String k8sHelperClassPath;- if (baselineOsInfo.isLinux()) {+ if (osInfo.isLinux()) {k8sHelperClassPath = "/k8s-helper/*";} else {k8sHelperClassPath = "C:\\k8s-helper\\*";@@ -871,7 +892,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataMap<Object, Object> initContainerSpec = CollectionUtils.newHashMap("name", "init",- "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,+ "image", helperImage,"command", Lists.newArrayList("java"),"args", initArgs,"env", commonEnvs,@@ -879,7 +900,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataMap<Object, Object> sidecarContainerSpec = CollectionUtils.newHashMap("name", "sidecar",- "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion,+ "image", helperImage,"command", Lists.newArrayList("java"),"args", sidecarArgs,"env", commonEnvs,@@ -913,7 +934,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataMap<Object, Object> cacheHomeVolume = CollectionUtils.newLinkedHashMap("name", "cache-home","hostPath", CollectionUtils.newLinkedHashMap(- "path", baselineOsInfo.getCacheHome(),+ "path", osInfo.getCacheHome(),"type", "DirectoryOrCreate"));List<Object> volumes = Lists.<Object>newArrayList(buildHomeVolume, userHomeVolume, cacheHomeVolume);if (trustCertsConfigMapName != null) {@@ -1377,92 +1398,5 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}}-- private static class OsInfo {-- private static final Map<Integer, String> WINDOWS_VERSIONS = new LinkedHashMap<>();-- static {- // update this according to- // https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility- WINDOWS_VERSIONS.put(14393, "1607");- WINDOWS_VERSIONS.put(16299, "1709");- WINDOWS_VERSIONS.put(17134, "1803");- WINDOWS_VERSIONS.put(17763, "1809");- WINDOWS_VERSIONS.put(18362, "1903");- WINDOWS_VERSIONS.put(18363, "1909");- WINDOWS_VERSIONS.put(19041, "2004");- WINDOWS_VERSIONS.put(19042, "20H2");- WINDOWS_VERSIONS.put(19043, "2004");- }-- private final String osName;-- private final String osVersion;-- public OsInfo(String osName, String osVersion) {- this.osName = osName;- this.osVersion = osVersion;- }-- public boolean isLinux() {- return osName.equalsIgnoreCase("linux");- }-- public boolean isWindows() {- return osName.equalsIgnoreCase("windows");- }-- public int getWindowsBuildNumber() {- Preconditions.checkState(isWindows());- List<String> fields = Splitter.on(".").splitToList(osVersion);- return Integer.parseInt(fields.get(fields.size()-2));- }-- public String getCacheHome() {- if (osName.equalsIgnoreCase("linux"))- return "/var/cache/onedev-build";- else- return "C:\\ProgramData\\onedev-build\\cache";- }-- public static OsInfo getBaseline(Collection<OsInfo> osInfos) {- if (osInfos.iterator().next().isLinux()) {- for (OsInfo osInfo: osInfos) {- if (!osInfo.isLinux())- throw new ExplicitException("Linux and non-linux nodes should not be included in same executor");- }- return osInfos.iterator().next();- } else if (osInfos.iterator().next().isWindows()) {- OsInfo baseline = null;- for (OsInfo osInfo: osInfos) {- if (!osInfo.isWindows())- throw new ExplicitException("Windows and non-windows nodes should not be included in same executor");- if (baseline == null || baseline.getWindowsBuildNumber() > osInfo.getWindowsBuildNumber())- baseline = osInfo;- }- return baseline;- } else {- throw new ExplicitException("Either Windows or Linux nodes can be included in an executor");- }- }-- public String getWindowsVersion() {- int buildNumber = getWindowsBuildNumber();- String windowsVersion = WINDOWS_VERSIONS.get(buildNumber);- if (windowsVersion != null)- return windowsVersion;- else- throw new ExplicitException("Unsupported windows build number: " + buildNumber);- }-- public String getHelperImageSuffix() {- if (isLinux())- return "linux";- else- return "windows-" + getWindowsVersion().toLowerCase();- }-- }}\ No newline at end of filediff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 8dbefb854f..b8f7292d41 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -2,10 +2,9 @@ package io.onedev.server.plugin.executor.serverdocker;import static io.onedev.agent.DockerExecutorUtils.cleanDirAsRoot;import static io.onedev.agent.DockerExecutorUtils.createNetwork;+import static io.onedev.agent.DockerExecutorUtils.isUseProcessIsolation;import static io.onedev.agent.DockerExecutorUtils.deleteNetwork;import static io.onedev.agent.DockerExecutorUtils.newDockerKiller;-import static io.onedev.agent.DockerExecutorUtils.newErrorLogger;-import static io.onedev.agent.DockerExecutorUtils.newInfoLogger;import static io.onedev.agent.DockerExecutorUtils.startService;import static io.onedev.k8shelper.KubernetesHelper.checkCacheAllocations;import static io.onedev.k8shelper.KubernetesHelper.cloneRepository;@@ -44,6 +43,7 @@ import com.google.common.base.Joiner;import com.google.common.base.Preconditions;import io.onedev.agent.DockerExecutorUtils;+import io.onedev.agent.ExecutorUtils;import io.onedev.agent.job.FailedException;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AppLoader;@@ -64,6 +64,9 @@ import io.onedev.k8shelper.ContainerExecutable;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.k8shelper.LeafExecutable;import io.onedev.k8shelper.LeafHandler;+import io.onedev.k8shelper.OsContainer;+import io.onedev.k8shelper.OsExecution;+import io.onedev.k8shelper.OsInfo;import io.onedev.k8shelper.ServerExecutable;import io.onedev.server.OneDev;import io.onedev.server.buildspec.Service;@@ -185,9 +188,11 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDacreateNetwork(newDocker(), network, jobLogger);try {+ OsInfo osInfo = OneDev.getInstance(OsInfo.class);+for (Service jobService: jobContext.getServices()) {jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");- startService(newDocker(), network, jobService.toMap(), jobLogger);+ startService(newDocker(), network, jobService.toMap(), osInfo, jobLogger);}File hostWorkspace = new File(hostBuildHome, "workspace");@@ -210,7 +215,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDajobContext.reportJobWorkspace(containerWorkspace);CompositeExecutable entryExecutable = new CompositeExecutable(jobContext.getActions());-boolean successful = entryExecutable.execute(new LeafHandler() {private int runStepContainer(String image, @Nullable String entrypoint,@@ -263,11 +267,15 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaif (entrypoint != null)docker.addArgs("--entrypoint=" + entrypoint);+ if (isUseProcessIsolation(newDocker(), image, osInfo, jobLogger))+ docker.addArgs("--isolation=process");+docker.addArgs(image);docker.addArgs(arguments.toArray(new String[arguments.size()]));- ExecutionResult result = docker.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger), null,- newDockerKiller(newDocker(), containerName, jobLogger));+ ExecutionResult result = docker.execute(ExecutorUtils.newInfoLogger(jobLogger),+ ExecutorUtils.newErrorLogger(jobLogger), null, newDockerKiller(newDocker(),+ containerName, jobLogger));return result.getReturnCode();}@@ -279,15 +287,16 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaif (executable instanceof CommandExecutable) {CommandExecutable commandExecutable = (CommandExecutable) executable;- if (commandExecutable.getImage() == null) {+ OsExecution execution = commandExecutable.getExecution(osInfo);+ if (execution.getImage() == null) {throw new ExplicitException("This step can only be executed by server shell "+ "executor or remote shell executor");}Commandline entrypoint = DockerExecutorUtils.getEntrypoint(- hostBuildHome, commandExecutable, hostAuthInfoHome.get() != null);+ hostBuildHome, commandExecutable, osInfo, hostAuthInfoHome.get() != null);- int exitCode = runStepContainer(commandExecutable.getImage(), entrypoint.executable(),+ int exitCode = runStepContainer(execution.getImage(), entrypoint.executable(),entrypoint.arguments(), new HashMap<>(), null, position, commandExecutable.isUseTTY());if (exitCode != 0) {@@ -296,13 +305,12 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa}} else if (executable instanceof ContainerExecutable) {ContainerExecutable containerExecutable = (ContainerExecutable) executable;-+ OsContainer container = containerExecutable.getContainer(osInfo);List<String> arguments = new ArrayList<>();- if (containerExecutable.getArgs() != null)- arguments.addAll(Arrays.asList(StringUtils.parseQuoteTokens(containerExecutable.getArgs())));- int exitCode = runStepContainer(containerExecutable.getImage(), null, arguments,- containerExecutable.getEnvMap(), containerExecutable.getWorkingDir(),- position, containerExecutable.isUseTTY());+ if (container.getArgs() != null)+ arguments.addAll(Arrays.asList(StringUtils.parseQuoteTokens(container.getArgs())));+ int exitCode = runStepContainer(container.getImage(), null, arguments, container.getEnvMap(),+ container.getWorkingDir(), position, containerExecutable.isUseTTY());if (exitCode != 0) {jobLogger.error("Step \"" + stepNames + "\" is failed: Container exited with code " + exitCode);return false;@@ -318,12 +326,12 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaCloneInfo cloneInfo = checkoutExecutable.getCloneInfo();- cloneInfo.writeAuthData(hostAuthInfoHome.get(), git, newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ cloneInfo.writeAuthData(hostAuthInfoHome.get(), git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));try {List<String> trustCertContent = getTrustCertContent();if (!trustCertContent.isEmpty()) {installGitCert(new File(hostAuthInfoHome.get(), "trust-cert.pem"), trustCertContent,- git, newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));}int cloneDepth = checkoutExecutable.getCloneDepth();@@ -331,11 +339,11 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDacloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),checkoutExecutable.isWithLfs(), checkoutExecutable.isWithSubmodules(),- cloneDepth, newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ cloneDepth, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));} finally {git.clearArgs();git.addArgs("config", "--global", "--unset", "core.sshCommand");- ExecutionResult result = git.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ ExecutionResult result = git.execute(ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));if (result.getReturnCode() != 5 && result.getReturnCode() != 0)result.checkReturnCode();}diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex cc81425809..eb42f537a7 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -1,7 +1,5 @@package io.onedev.server.plugin.executor.servershell;-import static io.onedev.agent.ShellExecutorUtils.newErrorLogger;-import static io.onedev.agent.ShellExecutorUtils.newInfoLogger;import static io.onedev.agent.ShellExecutorUtils.resolveCachePath;import static io.onedev.agent.ShellExecutorUtils.testCommands;import static io.onedev.k8shelper.KubernetesHelper.checkCacheAllocations;@@ -26,6 +24,7 @@ import java.util.function.Consumer;import javax.validation.constraints.Size;+import io.onedev.agent.ExecutorUtils;import io.onedev.agent.job.FailedException;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AppLoader;@@ -43,6 +42,8 @@ import io.onedev.k8shelper.CompositeExecutable;import io.onedev.k8shelper.ContainerExecutable;import io.onedev.k8shelper.LeafExecutable;import io.onedev.k8shelper.LeafHandler;+import io.onedev.k8shelper.OsExecution;+import io.onedev.k8shelper.OsInfo;import io.onedev.k8shelper.ServerExecutable;import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.CacheSpec;@@ -128,6 +129,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatCompositeExecutable entryExecutable = new CompositeExecutable(jobContext.getActions());+ OsInfo osInfo = OneDev.getInstance(OsInfo.class);boolean successful = entryExecutable.execute(new LeafHandler() {@Override@@ -137,7 +139,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatif (executable instanceof CommandExecutable) {CommandExecutable commandExecutable = (CommandExecutable) executable;- if (commandExecutable.getImage() != null) {+ OsExecution execution = commandExecutable.getExecution(osInfo);+ if (execution.getImage() != null) {throw new ExplicitException("This step can only be executed by server docker executor, "+ "remote docker executor, or kubernetes executor");}@@ -146,7 +149,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDattry {FileUtils.writeLines(jobScriptFile,- new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), buildDir)),+ new ArrayList<>(replacePlaceholders(execution.getCommands(), buildDir)),commandExecutable.getEndOfLine());} catch (IOException e) {throw new RuntimeException(e);@@ -176,7 +179,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatinterpreter.workingDir(workspaceDir).environments(environments);interpreter.addArgs(jobScriptFile.getAbsolutePath());- ExecutionResult result = interpreter.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ ExecutionResult result = interpreter.execute(ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));if (result.getReturnCode() != 0) {jobLogger.error("Step \"" + stepNames + "\" is failed: Command exited with code " + result.getReturnCode());return false;@@ -196,12 +199,12 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatCloneInfo cloneInfo = checkoutExecutable.getCloneInfo();- cloneInfo.writeAuthData(userDir, git, newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ cloneInfo.writeAuthData(userDir, git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));List<String> trustCertContent = getTrustCertContent();if (!trustCertContent.isEmpty()) {installGitCert(new File(userDir, "trust-cert.pem"), trustCertContent,- git, newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));}int cloneDepth = checkoutExecutable.getCloneDepth();@@ -209,7 +212,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatcloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),checkoutExecutable.isWithLfs(), checkoutExecutable.isWithSubmodules(),- cloneDepth, newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ cloneDepth, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newErrorLogger(jobLogger));} catch (Exception e) {jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));return false;