Skip to content

The Unified and Autonomous Development Platform

feat: Able to specify environment variables for Kaniko build image step (OD-2036)

Robin Shena4d13ddf2e63
diff --git a/pom.xml b/pom.xml
index 0f750a1a05..97c8ed35b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.2.3</version>
</parent>
<artifactId>server</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@@ -637,7 +637,7 @@
</repositories>
<properties>
<commons.version>3.0.3</commons.version>
- <agent.version>2.1.3</agent.version>
+ <agent.version>2.1.4</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 5122a44305..d0b1edcaec 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<build>
<plugins>
diff --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.java
index e3d9c115b2..e7166f3e19 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
@@ -109,7 +109,7 @@ public class BuildImageStep extends Step {
public void setPlatforms(String platforms) {
this.platforms = platforms;
}
-
+
@Editable(order=1400, group = "More Settings", description="Optionally specify additional options for " +
"buildx build command")
@Interpolative(variableSuggester="suggestVariables")
@@ -133,6 +133,7 @@ public class BuildImageStep extends Step {
accessToken = build.getJobAuthorizationContext().getSecretValue(getBuiltInRegistryAccessTokenSecret());
else
accessToken = null;
+
return new BuildImageFacade(getBuildPath(), getDockerfile(), getOutput().getFacade(),
accessToken, getPlatforms(), getMoreOptions());
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
index 347394e9ed..2054c03c95 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
@@ -8,6 +8,7 @@ import io.onedev.k8shelper.CommandFacade;
import io.onedev.server.OneDev;
import io.onedev.server.annotation.*;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.job.EnvVar;
import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;
import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;
import io.onedev.server.entitymanager.SettingManager;
@@ -15,11 +16,13 @@ import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.jobexecutor.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.RegistryLoginAware;
import io.onedev.server.util.UrlUtils;
+import org.apache.shiro.crypto.hash.Hash;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import static io.onedev.agent.DockerExecutorUtils.buildDockerConfig;
@@ -37,6 +40,8 @@ public class BuildImageWithKanikoStep extends CommandStep {
private Output output = new RegistryOutput();
private String trustCertificates;
+
+ private List<EnvVar> envVars = new ArrayList<>();
private String moreOptions;
@@ -116,6 +121,16 @@ public class BuildImageWithKanikoStep extends CommandStep {
return "Optionally specify a <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> to be used as access token for built-in registry server " +
"<code>" + server + "</code>";
}
+
+ @Editable(order=1150, name="Environment Variables", group="More Settings", description="Optionally specify environment "
+ + "variables for this step")
+ public List<EnvVar> getEnvVars() {
+ return envVars;
+ }
+
+ public void setEnvVars(List<EnvVar> envVars) {
+ this.envVars = envVars;
+ }
@Editable(order=1200, group="More Settings", description="Optionally specify <a href='https://github.com/GoogleContainerTools/kaniko?tab=readme-ov-file#additional-flags' target='_blank'>additional options</a> of kaniko")
@Interpolative(variableSuggester="suggestVariables")
@@ -163,7 +178,12 @@ public class BuildImageWithKanikoStep extends CommandStep {
commandsBuilder.append(" ").append(getMoreOptions());
commandsBuilder.append("\n");
- return new CommandFacade(image, runAs, builtInRegistryAccessToken, commandsBuilder.toString(), useTTY);
+
+ var envMap = new HashMap<String, String>();
+ for (var envVar: getEnvVars())
+ envMap.put(envVar.getName(), envVar.getValue());
+
+ return new CommandFacade(image, runAs, builtInRegistryAccessToken, commandsBuilder.toString(), envMap, useTTY);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java
index abccb413d0..2613b787e0 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java
@@ -15,6 +15,8 @@ import io.onedev.server.model.support.administration.jobexecutor.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.RegistryLoginAware;
import io.onedev.server.util.UrlUtils;
+import java.util.HashMap;
+
import static io.onedev.agent.DockerExecutorUtils.buildDockerConfig;
import static java.util.stream.Collectors.toList;
@@ -103,7 +105,8 @@ public abstract class CraneStep extends CommandStep {
commandsBuilder.append("export SSL_CERT_FILE=/root/trust-certs.crt");
}
commandsBuilder.append(getCommand());
- return new CommandFacade(image, runAs, builtInRegistryAccessToken, commandsBuilder.toString(), useTTY);
+ return new CommandFacade(image, runAs, builtInRegistryAccessToken, commandsBuilder.toString(),
+ new HashMap<>(), useTTY);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.java
index b0acb90571..01737677b2 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/DefaultInterpreter.java
@@ -7,6 +7,7 @@ import io.onedev.server.annotation.Interpolative;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import javax.validation.constraints.NotEmpty;
+import java.util.HashMap;
@Editable(order=100, name="Default (Shell on Linux, Batch on Windows)")
public class DefaultInterpreter extends Interpreter {
@@ -31,7 +32,8 @@ public class DefaultInterpreter extends Interpreter {
@Override
public CommandFacade getExecutable(JobExecutor jobExecutor, String jobToken, String image,
String runAs, String builtInRegistryAccessToken, boolean useTTY) {
- return new CommandFacade(image, runAs, builtInRegistryAccessToken, getCommands(), useTTY);
+ return new CommandFacade(image, runAs, builtInRegistryAccessToken, getCommands(),
+ new HashMap<>(), useTTY);
}
}
diff --git a/server-ee b/server-ee
index 6d321c5d86..d5848cd101 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 6d321c5d8647f54bd58ba6eaff5edf8e7ba8d64e
+Subproject commit d5848cd101cc341d8e18313a1bf7073be1039961
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 4dfa1d35a2..783c27aa19 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index 7d4261d16c..95a57c2690 100644
--- a/server-plugin/server-plugin-archetype/pom.xml
+++ b/server-plugin/server-plugin-archetype/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index be110174e8..3cc47fb5d7 100644
--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml
+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-dotnet/pom.xml b/server-plugin/server-plugin-buildspec-dotnet/pom.xml
index 19f657cd2a..f67533c932 100644
--- a/server-plugin/server-plugin-buildspec-dotnet/pom.xml
+++ b/server-plugin/server-plugin-buildspec-dotnet/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml
index 8c5af7edc9..a6d98e8df7 100644
--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml
+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml
index cec4d83105..f3480132f3 100644
--- a/server-plugin/server-plugin-buildspec-maven/pom.xml
+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml
index 2937fd9ed9..5830de84ae 100644
--- a/server-plugin/server-plugin-buildspec-node/pom.xml
+++ b/server-plugin/server-plugin-buildspec-node/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index 0b5575c57b..6e9336933b 100644
--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
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.java
index e66110f6f1..e57f453920 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
@@ -33,11 +33,9 @@ import io.onedev.server.terminal.Terminal;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.FilenameUtils;
import io.onedev.server.web.util.Testable;
-import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.SerializationUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.SystemUtils;
-import org.apache.commons.text.WordUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
@@ -114,8 +112,6 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
private List<ImageMapping> imageMappings = new ArrayList<>();
- private transient volatile OsInfo osInfo;
-
private transient volatile String containerName;
private transient List<ImageMappingFacade> imageMappingFacades;
@@ -282,8 +278,8 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
@Editable(order=28000, group="More Settings", description = "Optionally maps a docker image to a different " +
"image. The first matching entry will take effect, or image will remain unchanged if no matching entries " +
- "found. For instance a mapping entry with <code>From</code> specified as <code>1dev/k8s-helper-linux:(.*)</code>, " +
- "and <code>To</code> specified as <code>my-local-registry/k8s-helper-linux:$1</code> will map the " +
+ "found. For instance a mapping entry with <code>From</code> specified as <code>1dev/k8s-helper:(.*)</code>, " +
+ "and <code>To</code> specified as <code>my-local-registry/k8s-helper:$1</code> will map the " +
"k8s helper image from official docker registry to local registry, with repository and tag unchanged")
public List<ImageMapping> getImageMappings() {
return imageMappings;
@@ -309,35 +305,30 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
@Override
public void resume(JobContext jobContext) {
- if (osInfo != null) {
- Commandline kubectl = newKubeCtl();
- kubectl.addArgs("exec", "job", "--container", "sidecar", "--namespace", getNamespace(jobContext), "--");
- if (osInfo.isLinux())
- kubectl.addArgs("touch", "/onedev-build/continue");
- else
- kubectl.addArgs("cmd", "-c", "copy", "NUL", "C:\\onedev-build\\continue");
- kubectl.execute(new LineConsumer() {
+ Commandline kubectl = newKubeCtl();
+ kubectl.addArgs("exec", "job", "--container", "sidecar", "--namespace", getNamespace(jobContext), "--");
+ kubectl.addArgs("touch", "/onedev-build/continue");
+ kubectl.execute(new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ }
- }, new LineConsumer() {
+ }, new LineConsumer() {
- @Override
- public void consume(String line) {
- logger.error("Kubernetes: " + line);
- }
+ @Override
+ public void consume(String line) {
+ logger.error("Kubernetes: " + line);
+ }
- }).checkReturnCode();
- }
+ }).checkReturnCode();
}
@Override
public Shell openShell(JobContext jobContext, Terminal terminal) {
String containerNameCopy = containerName;
- if (osInfo != null && containerNameCopy != null) {
+ if (containerNameCopy != null) {
Commandline kubectl = newKubeCtl();
kubectl.addArgs("exec", "-it", POD_NAME, "-c", containerNameCopy,
"--namespace", getNamespace(jobContext), "--");
@@ -347,15 +338,11 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
List<Integer> stepPosition = parseStepPosition(containerNameCopy.substring("step-".length()));
LeafFacade step = Preconditions.checkNotNull(jobContext.getStep(stepPosition));
if (step instanceof RunContainerFacade)
- workingDir = ((RunContainerFacade)step).getContainer(osInfo).getWorkingDir();
- else if (osInfo.isLinux())
+ workingDir = ((RunContainerFacade)step).getWorkingDir();
+ else
workingDir = "/onedev-build/workspace";
- else
- workingDir = "C:\\onedev-build\\workspace";
- } else if (osInfo.isLinux()) {
- workingDir = "/onedev-build/workspace";
} else {
- workingDir = "C:\\onedev-build\\workspace";
+ workingDir = "/onedev-build/workspace";
}
String[] shell = null;
@@ -363,19 +350,13 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
List<Integer> stepPosition = parseStepPosition(containerNameCopy.substring("step-".length()));
LeafFacade step = Preconditions.checkNotNull(jobContext.getStep(stepPosition));
if (step instanceof CommandFacade)
- shell = ((CommandFacade)step).getShell(osInfo.isWindows(), workingDir);
+ shell = ((CommandFacade)step).getShell(false, workingDir);
}
if (shell == null) {
- if (workingDir != null) {
- if (osInfo.isLinux())
- shell = new String[]{"sh", "-c", String.format("cd '%s' && sh", workingDir)};
- else
- shell = new String[]{"cmd", "/c", String.format("cd %s && cmd", workingDir)};
- } else if (osInfo.isLinux()) {
+ if (workingDir != null)
+ shell = new String[]{"sh", "-c", String.format("cd '%s' && sh", workingDir)};
+ else
shell = new String[]{"sh"};
- } else {
- shell = new String[]{"cmd"};
- }
}
kubectl.addArgs(shell);
return new CommandlineShell(terminal, kubectl);
@@ -559,44 +540,6 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
}).checkReturnCode();
}
- private OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, TaskLogger jobLogger) {
- Commandline kubectl = newKubeCtl();
- 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());
-
- Collection<OsInfo> osInfos = new ArrayList<>();
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- kubectl.execute(baos, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logKubernetesError(jobLogger, line);
- }
-
- }).checkReturnCode();
-
- for (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() == 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()) {
- return OsInfo.getBaseline(osInfos);
- } else {
- jobLogger.warning("No matching nodes found, assuming baseline os as amd64 linux");
- return new OsInfo("Linux", "", "amd64");
- }
- }
-
private String getServerUrl() {
return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl().toString();
}
@@ -820,7 +763,6 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
jobLogger.log("Waiting for service to be ready...");
- OsInfo baselineOsInfo = getBaselineOsInfo(nodeSelector, jobLogger);
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
while (true) {
Commandline kubectl = newKubeCtl();
@@ -869,11 +811,7 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
if (!getStartedContainers(containerStatusNodes).isEmpty()) {
kubectl = newKubeCtl();
- kubectl.addArgs("exec", podName, "-n", namespace, "--");
- if (baselineOsInfo.isLinux())
- kubectl.addArgs("sh", "-c");
- else
- kubectl.addArgs("cmd.exe", "/c");
+ kubectl.addArgs("exec", podName, "-n", namespace, "--", "sh", "-c");
kubectl.addArgs(jobService.getReadinessCheckCommand());
var result = kubectl.execute(new LineConsumer() {
@@ -989,27 +927,14 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
createResource(pvcDef, Sets.newHashSet(), jobLogger);
}
- osInfo = getBaselineOsInfo(getNodeSelector(), jobLogger);
-
Map<String, Object> podSpec = new LinkedHashMap<>();
List<Map<Object, Object>> containerSpecs = new ArrayList<>();
- String containerBuildHome;
- String containerCommandDir;
- String containerTrustCertsDir;
- String containerWorkspace;
- if (osInfo.isWindows()) {
- containerBuildHome = "C:\\onedev-build";
- containerWorkspace = containerBuildHome + "\\workspace";
- containerCommandDir = containerBuildHome + "\\command";
- containerTrustCertsDir = containerBuildHome + "\\trust-certs";
- } else {
- containerBuildHome = "/onedev-build";
- containerWorkspace = containerBuildHome +"/workspace";
- containerCommandDir = containerBuildHome + "/command";
- containerTrustCertsDir = containerBuildHome + "/trust-certs";
- }
+ var containerBuildHome = "/onedev-build";
+ var containerWorkspace = containerBuildHome +"/workspace";
+ var containerCommandDir = containerBuildHome + "/command";
+ var containerTrustCertsDir = containerBuildHome + "/trust-certs";
Map<String, String> buildHomeMount = newLinkedHashMap(
"name", "build-home",
@@ -1028,25 +953,14 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
} else {
List<Action> actions = new ArrayList<>();
CommandFacade facade = new CommandFacade((String) executionContext, null, null,
- "this does not matter", false);
+ "this does not matter", new HashMap<>(), false);
actions.add(new Action("test", facade, ExecuteCondition.ALWAYS));
entryFacade = new CompositeFacade(actions);
}
List<String> containerNames = newArrayList("init");
- 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 = mapImage(IMAGE_REPO_PREFIX + "-" + helperImageSuffix + ":" + KubernetesHelper.getVersion());
+ String helperImage = mapImage(IMAGE_REPO + ":" + KubernetesHelper.getVersion());
ArrayList<Map<Object, Object>> commonEnvs = new ArrayList<>();
commonEnvs.add(newLinkedHashMap(
@@ -1055,10 +969,6 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
commonEnvs.add(newLinkedHashMap(
"name", ENV_JOB_TOKEN,
"value", jobToken));
- commonEnvs.add(newLinkedHashMap(
- "name", ENV_OS_INFO,
- "value", Hex.encodeHexString(SerializationUtils.serialize(osInfo))
- ));
commonEnvs.add(newLinkedHashMap(
"name", "ONEDEV_WORKSPACE",
"value", containerWorkspace
@@ -1071,15 +981,14 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
Map<Object, Object> stepContainerSpec;
if (facade instanceof CommandFacade) {
CommandFacade commandFacade = (CommandFacade) facade;
- OsExecution execution = commandFacade.getExecution(osInfo);
- if (execution.getImage() == null) {
+ if (commandFacade.getImage() == null) {
throw new ExplicitException("This step can only be executed by server shell "
+ "executor or remote shell executor");
}
stepContainerSpec = newHashMap(
"name", containerName,
- "image", mapImage(execution.getImage()));
+ "image", mapImage(commandFacade.getImage()));
if (isAlwaysPullImage())
stepContainerSpec.put("imagePullPolicy", "Always");
if (commandFacade.isUseTTY())
@@ -1088,7 +997,7 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
volumeMounts.addAll(commonVolumeMounts);
stepContainerSpec.put("volumeMounts", SerializationUtils.clone(volumeMounts));
stepContainerSpec.put("env", SerializationUtils.clone(commonEnvs));
- setupSecurityContext(stepContainerSpec, execution.getRunAs());
+ setupSecurityContext(stepContainerSpec, commandFacade.getRunAs());
} else if (facade instanceof BuildImageFacade) {
throw new ExplicitException("This step can only be executed by server docker executor or " +
"remote docker executor. Use kaniko step instead to build image in kubernetes cluster");
@@ -1112,13 +1021,8 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
if (stepContainerSpec != null) {
String positionStr = stringifyStepPosition(position);
- if (osInfo.isLinux()) {
- stepContainerSpec.put("command", newArrayList("sh"));
- stepContainerSpec.put("args", newArrayList(containerCommandDir + "/" + positionStr + ".sh"));
- } else {
- stepContainerSpec.put("command", newArrayList("cmd"));
- stepContainerSpec.put("args", newArrayList("/c", containerCommandDir + "\\" + positionStr + ".bat"));
- }
+ stepContainerSpec.put("command", newArrayList("sh"));
+ stepContainerSpec.put("args", newArrayList(containerCommandDir + "/" + positionStr + ".sh"));
Map<Object, Object> requestsSpec = newLinkedHashMap(
"cpu", "0",
@@ -1140,12 +1044,7 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwar
return null;
}, new ArrayList<>());
- String k8sHelperClassPath;
- if (osInfo.isLinux()) {
- k8sHelperClassPath = "/k8s-helper/*";
- } else {
- k8sHelperClassPath = "C:\\k8s-helper\\*";
- }
+ String k8sHelperClassPath = "/k8s-helper/*";
List<String> sidecarArgs = newArrayList(
"-classpath", k8sHelperClassPath,
diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml
index 8cf3064923..1f145e8248 100644
--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml
+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xml
index 3c6c06fac5..03f12a3a51 100644
--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml
+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml
index ec29ab236a..f2b6deb62d 100644
--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml
+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 027ef70e33..da65e9ec41 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
@@ -437,24 +437,23 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAw
if (facade instanceof CommandFacade) {
CommandFacade commandFacade = (CommandFacade) facade;
- OsExecution execution = commandFacade.getExecution(osInfo);
- if (execution.getImage() == null) {
+ if (commandFacade.getImage() == null) {
throw new ExplicitException("This step can only be executed by server shell "
+ "executor or remote shell executor");
}
- Commandline entrypoint = getEntrypoint(hostBuildHome, commandFacade, osInfo, position);
+ Commandline entrypoint = getEntrypoint(hostBuildHome, commandFacade, position);
var builtInRegistryLogin = new BuiltInRegistryLogin(serverUrl,
jobContext.getJobToken(), commandFacade.getBuiltInRegistryAccessToken());
var docker = newDocker();
- if (changeOwner(hostBuildHome, execution.getRunAs(), docker, Bootstrap.isInDocker()))
+ if (changeOwner(hostBuildHome, commandFacade.getRunAs(), docker, Bootstrap.isInDocker()))
ownerChanged.set(true);
docker.clearArgs();
int exitCode = callWithDockerConfig(docker, getRegistryLoginFacades(), builtInRegistryLogin, () -> {
- return runStepContainer(docker, execution.getImage(), execution.getRunAs(),
- entrypoint.executable(), entrypoint.arguments(), new HashMap<>(), null,
- new HashMap<>(), position, commandFacade.isUseTTY());
+ return runStepContainer(docker, commandFacade.getImage(), commandFacade.getRunAs(),
+ entrypoint.executable(), entrypoint.arguments(), commandFacade.getEnvMap(),
+ null, new HashMap<>(), position, commandFacade.isUseTTY());
});
if (exitCode != 0) {
@@ -490,21 +489,20 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAw
});
} else if (facade instanceof RunContainerFacade) {
RunContainerFacade runContainerFacade = (RunContainerFacade) facade;
- OsContainer container = runContainerFacade.getContainer(osInfo);
List<String> arguments = new ArrayList<>();
- if (container.getArgs() != null)
- arguments.addAll(Arrays.asList(StringUtils.parseQuoteTokens(container.getArgs())));
+ if (runContainerFacade.getArgs() != null)
+ arguments.addAll(Arrays.asList(StringUtils.parseQuoteTokens(runContainerFacade.getArgs())));
var builtInRegistryLogin = new BuiltInRegistryLogin(serverUrl,
jobContext.getJobToken(), runContainerFacade.getBuiltInRegistryAccessToken());
var docker = newDocker();
- if (changeOwner(hostBuildHome, container.getRunAs(), docker, Bootstrap.isInDocker()))
+ if (changeOwner(hostBuildHome, runContainerFacade.getRunAs(), docker, Bootstrap.isInDocker()))
ownerChanged.set(true);
docker.clearArgs();
int exitCode = callWithDockerConfig(docker, getRegistryLoginFacades(), builtInRegistryLogin, () -> {
- return runStepContainer(docker, container.getImage(), container.getRunAs(), null,
- arguments, container.getEnvMap(), container.getWorkingDir(), container.getVolumeMounts(),
+ return runStepContainer(docker, runContainerFacade.getImage(), runContainerFacade.getRunAs(), null,
+ arguments, runContainerFacade.getEnvMap(), runContainerFacade.getWorkingDir(), runContainerFacade.getVolumeMounts(),
position, runContainerFacade.isUseTTY());
});
if (exitCode != 0) {
diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xml
index 32709566e6..9d0646528d 100644
--- a/server-plugin/server-plugin-executor-servershell/pom.xml
+++ b/server-plugin/server-plugin-executor-servershell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
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.java
index 4635908cad..4f7c4f300c 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
@@ -149,8 +149,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
private boolean doExecute(LeafFacade facade, List<Integer> position) {
if (facade instanceof CommandFacade) {
CommandFacade commandFacade = (CommandFacade) facade;
- OsExecution execution = commandFacade.getExecution(osInfo);
- if (execution.getImage() != null) {
+ if (commandFacade.getImage() != null) {
throw new ExplicitException("This step can only be executed by server docker executor, "
+ "remote docker executor, or kubernetes executor");
}
@@ -163,7 +162,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
try {
FileUtils.writeStringToFile(
stepScriptFile,
- commandFacade.normalizeCommands(replacePlaceholders(execution.getCommands(), buildHome)),
+ commandFacade.normalizeCommands(replacePlaceholders(commandFacade.getCommands(), buildHome)),
StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -173,6 +172,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
Map<String, String> environments = new HashMap<>();
environments.put("GIT_HOME", userHome.getAbsolutePath());
environments.put("ONEDEV_WORKSPACE", workspaceDir.getAbsolutePath());
+ environments.putAll(commandFacade.getEnvMap());
interpreter.workingDir(workspaceDir).environments(environments);
interpreter.addArgs(stepScriptFile.getAbsolutePath());
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
index e55ee0cebb..cc836c40a9 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml
index ec7f6a19fc..37aa6621c3 100644
--- a/server-plugin/server-plugin-import-gitea/pom.xml
+++ b/server-plugin/server-plugin-import-gitea/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index 058cdc7b32..b7d359270b 100644
--- a/server-plugin/server-plugin-import-github/pom.xml
+++ b/server-plugin/server-plugin-import-github/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml
index 7bed545a5c..08d7490e41 100644
--- a/server-plugin/server-plugin-import-gitlab/pom.xml
+++ b/server-plugin/server-plugin-import-gitlab/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml
index 5594eb7747..84dd07827f 100644
--- a/server-plugin/server-plugin-import-jiracloud/pom.xml
+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xml
index 14b5e482ac..43d4f5de34 100644
--- a/server-plugin/server-plugin-import-url/pom.xml
+++ b/server-plugin/server-plugin-import-url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml
index 02e1ccf3c8..e30c635461 100644
--- a/server-plugin/server-plugin-import-youtrack/pom.xml
+++ b/server-plugin/server-plugin-import-youtrack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>
diff --git a/server-plugin/server-plugin-mailservice-gmail/pom.xml b/server-plugin/server-plugin-mailservice-gmail/pom.xml
index 3b60fad95c..039744aa0e 100644
--- a/server-plugin/server-plugin-mailservice-gmail/pom.xml
+++ b/server-plugin/server-plugin-mailservice-gmail/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.gmail.GmailModule</moduleClass>
diff --git a/server-plugin/server-plugin-mailservice-office365/pom.xml b/server-plugin/server-plugin-mailservice-office365/pom.xml
index bfad38676a..de5eca5902 100644
--- a/server-plugin/server-plugin-mailservice-office365/pom.xml
+++ b/server-plugin/server-plugin-mailservice-office365/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.office365.Office365Module</moduleClass>
diff --git a/server-plugin/server-plugin-mailservice-smtpimap/pom.xml b/server-plugin/server-plugin-mailservice-smtpimap/pom.xml
index 265297e544..3f94ef3c7a 100644
--- a/server-plugin/server-plugin-mailservice-smtpimap/pom.xml
+++ b/server-plugin/server-plugin-mailservice-smtpimap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.mailservice.smtpimap.SmtpImapModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xml
index d401f39e4c..e9d6096424 100644
--- a/server-plugin/server-plugin-notification-discord/pom.xml
+++ b/server-plugin/server-plugin-notification-discord/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-ntfy/pom.xml b/server-plugin/server-plugin-notification-ntfy/pom.xml
index 5403cefef9..0faefdd2bd 100644
--- a/server-plugin/server-plugin-notification-ntfy/pom.xml
+++ b/server-plugin/server-plugin-notification-ntfy/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.ntfy.NtfyModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xml
index 4ffba7be1c..703fa3e3d2 100644
--- a/server-plugin/server-plugin-notification-slack/pom.xml
+++ b/server-plugin/server-plugin-notification-slack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>
diff --git a/server-plugin/server-plugin-pack-container/pom.xml b/server-plugin/server-plugin-pack-container/pom.xml
index 1d35ffb204..1c6169a369 100644
--- a/server-plugin/server-plugin-pack-container/pom.xml
+++ b/server-plugin/server-plugin-pack-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-gem/pom.xml b/server-plugin/server-plugin-pack-gem/pom.xml
index fc15de7008..a25b4db16b 100644
--- a/server-plugin/server-plugin-pack-gem/pom.xml
+++ b/server-plugin/server-plugin-pack-gem/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-maven/pom.xml b/server-plugin/server-plugin-pack-maven/pom.xml
index 9ca9cb8d35..d4b9d1a41c 100644
--- a/server-plugin/server-plugin-pack-maven/pom.xml
+++ b/server-plugin/server-plugin-pack-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-npm/pom.xml b/server-plugin/server-plugin-pack-npm/pom.xml
index 22a4e27abb..fed79d8e5b 100644
--- a/server-plugin/server-plugin-pack-npm/pom.xml
+++ b/server-plugin/server-plugin-pack-npm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-nuget/pom.xml b/server-plugin/server-plugin-pack-nuget/pom.xml
index 82800bcb21..1fcbca98e2 100644
--- a/server-plugin/server-plugin-pack-nuget/pom.xml
+++ b/server-plugin/server-plugin-pack-nuget/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-pack-pypi/pom.xml b/server-plugin/server-plugin-pack-pypi/pom.xml
index ec0466d5dd..866edcd073 100644
--- a/server-plugin/server-plugin-pack-pypi/pom.xml
+++ b/server-plugin/server-plugin-pack-pypi/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index d0b4afed47..6ef91ad8ce 100644
--- a/server-plugin/server-plugin-report-checkstyle/pom.xml
+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 8f8bf169c7..d1245ff135 100644
--- a/server-plugin/server-plugin-report-clover/pom.xml
+++ b/server-plugin/server-plugin-report-clover/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-cobertura/pom.xml b/server-plugin/server-plugin-report-cobertura/pom.xml
index 61e23112d8..0d2fbab02e 100644
--- a/server-plugin/server-plugin-report-cobertura/pom.xml
+++ b/server-plugin/server-plugin-report-cobertura/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xml
index c029c7e654..18340935e5 100644
--- a/server-plugin/server-plugin-report-coverage/pom.xml
+++ b/server-plugin/server-plugin-report-coverage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xml
index 3b0290cf92..1012223b4e 100644
--- a/server-plugin/server-plugin-report-cpd/pom.xml
+++ b/server-plugin/server-plugin-report-cpd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-html/pom.xml b/server-plugin/server-plugin-report-html/pom.xml
index 110ca9e324..9632c46499 100644
--- a/server-plugin/server-plugin-report-html/pom.xml
+++ b/server-plugin/server-plugin-report-html/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.html.HtmlModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xml
index 8acd94d96a..da3ed34261 100644
--- a/server-plugin/server-plugin-report-jacoco/pom.xml
+++ b/server-plugin/server-plugin-report-jacoco/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index 95b2c6ccac..06016d94b8 100644
--- a/server-plugin/server-plugin-report-jest/pom.xml
+++ b/server-plugin/server-plugin-report-jest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xml
index abaf747be3..abccfd0c4e 100644
--- a/server-plugin/server-plugin-report-junit/pom.xml
+++ b/server-plugin/server-plugin-report-junit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index 24dd1d2f3e..f4da87a0f8 100644
--- a/server-plugin/server-plugin-report-markdown/pom.xml
+++ b/server-plugin/server-plugin-report-markdown/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xml
index 601adcf921..0ee43b893e 100644
--- a/server-plugin/server-plugin-report-pmd/pom.xml
+++ b/server-plugin/server-plugin-report-pmd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xml
index d993aba548..5e63facdad 100644
--- a/server-plugin/server-plugin-report-problem/pom.xml
+++ b/server-plugin/server-plugin-report-problem/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-roslynator/pom.xml b/server-plugin/server-plugin-report-roslynator/pom.xml
index 55de4938e4..950c77e0d6 100644
--- a/server-plugin/server-plugin-report-roslynator/pom.xml
+++ b/server-plugin/server-plugin-report-roslynator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xml
index 128ca6b57b..7be0ce0649 100644
--- a/server-plugin/server-plugin-report-spotbugs/pom.xml
+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-trx/pom.xml b/server-plugin/server-plugin-report-trx/pom.xml
index 56bc983e7b..9411550cb5 100644
--- a/server-plugin/server-plugin-report-trx/pom.xml
+++ b/server-plugin/server-plugin-report-trx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xml
index 5b19508f7d..680ca709d5 100644
--- a/server-plugin/server-plugin-report-unittest/pom.xml
+++ b/server-plugin/server-plugin-report-unittest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xml
index 94e1f10fed..68a661c97c 100644
--- a/server-plugin/server-plugin-sso-discord/pom.xml
+++ b/server-plugin/server-plugin-sso-discord/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index feae0deb5c..605a5629ea 100644
--- a/server-plugin/server-plugin-sso-openid/pom.xml
+++ b/server-plugin/server-plugin-sso-openid/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 699744d25b..aa541afc24 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>11.0.5</version>
+ <version>11.0.6</version>
</parent>
<dependencies>
<dependency>