The Unified and Autonomous Development Platform
refactor: Consolidate CraneStep and RunImagetoolsStep into RegistryToolStep
Robin Shen90d835616d00
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.javaindex ef3a092c35..f68c99ac6a 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@@ -1,41 +1,10 @@package io.onedev.server.buildspec.step;-import static io.onedev.agent.AgentUtils.buildAuthConfig;-import static io.onedev.k8shelper.RegistryLoginFacade.merge;--import java.util.HashMap;-import java.util.List;-import java.util.Map;--import com.fasterxml.jackson.core.JsonProcessingException;-import com.fasterxml.jackson.databind.ObjectMapper;--import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.k8shelper.CommandFacade;-import io.onedev.k8shelper.RegistryLoginFacade;-import io.onedev.k8shelper.StepFacade;import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.annotation.Multiline;-import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.buildspec.param.ParamCombination;-import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;-import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;-import io.onedev.server.model.Build;-import io.onedev.server.model.support.administration.DockerAware;-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;-public abstract class CraneStep extends CommandStep {+public abstract class CraneStep extends RegistryToolStep {private static final long serialVersionUID = 1L;-- private String trustCertificates;-- @Editable- @Override- public boolean isRunInContainer() {- return true;- }@Editable@Override@@ -43,80 +12,4 @@ public abstract class CraneStep extends CommandStep {return "1dev/crane:1.0.0";}- @Override- public boolean isUseTTY() {- return true;- }-- @Override- public String getRunAs() {- return "0:0";- }-- @Editable(order=1000, name="Certificates to Trust", group = "More Settings", placeholder = "Base64 encoded PEM format, starting with " +- "-----BEGIN CERTIFICATE----- and ending with -----END CERTIFICATE-----",- description = "Specify certificates to trust if you are using self-signed certificates for your docker registries")- @Multiline(monospace = true)- @Interpolative(variableSuggester="suggestVariables")- public String getTrustCertificates() {- return trustCertificates;- }-- public void setTrustCertificates(String trustCertificates) {- this.trustCertificates = trustCertificates;- }-- @Editable(order=1100, group="More Settings", description="Optionally specify registry logins to override " +- "those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " +- "<code>@job_token@</code> for user name, and access token secret for password secret")- @Override- public List<RegistryLogin> getRegistryLogins() {- return super.getRegistryLogins();- }-- @Override- public void setRegistryLogins(List<RegistryLogin> registryLogins) {- super.setRegistryLogins(registryLogins);- }-- static List<InputSuggestion> suggestVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith, true, true, false);- }-- @Override- public Interpreter getInterpreter() {- return new PosixInterpreter();- }-- @Override- public StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination,- List<RegistryLoginFacade> registryLogins, Map<String, String> envMap) {- var commandsBuilder = new StringBuilder();- if (jobExecutor instanceof DockerAware) {- DockerAware registryLoginAware = (DockerAware) jobExecutor;- commandsBuilder.append("mkdir /root/.docker\n");- commandsBuilder.append("cat <<EOF>> /root/.docker/config.json\n");- var mergedRegistryLogins = merge(registryLogins, registryLoginAware.getRegistryLogins(jobToken));- var configMap = new HashMap<String, Object>();- configMap.put("auths", buildAuthConfig(mergedRegistryLogins));- try {- commandsBuilder.append(new ObjectMapper().writeValueAsString(configMap)).append("\n");- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }- commandsBuilder.append("EOF\n");- }- if (getTrustCertificates() != null) {- commandsBuilder.append("cat <<EOF>> /root/trust-certs.crt\n");- commandsBuilder.append(getTrustCertificates().replace("\r\n", "\n")).append("\n");- commandsBuilder.append("EOF\n");- commandsBuilder.append("export SSL_CERT_FILE=/root/trust-certs.crt\n");- }- commandsBuilder.append(getCommand());- return new CommandFacade(getEffectiveImage(), getRunAs(), registryLogins,- envMap, isUseTTY(), commandsBuilder.toString());- }-- protected abstract String getCommand();-}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryToolStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryToolStep.javanew file mode 100644index 0000000000..516d7d4a2e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RegistryToolStep.java@@ -0,0 +1,120 @@+package io.onedev.server.buildspec.step;++import static io.onedev.agent.AgentUtils.buildAuthConfig;+import static io.onedev.k8shelper.RegistryLoginFacade.merge;++import java.util.HashMap;+import java.util.List;+import java.util.Map;++import com.fasterxml.jackson.core.JsonProcessingException;+import com.fasterxml.jackson.databind.ObjectMapper;++import io.onedev.commons.codeassist.InputSuggestion;+import io.onedev.k8shelper.CommandFacade;+import io.onedev.k8shelper.RegistryLoginFacade;+import io.onedev.k8shelper.StepFacade;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;+import io.onedev.server.annotation.Multiline;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.step.commandinterpreter.PosixInterpreter;+import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;+import io.onedev.server.model.Build;+import io.onedev.server.model.support.administration.DockerAware;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;++public abstract class RegistryToolStep extends CommandStep {++ private static final long serialVersionUID = 1L;++ private String trustCertificates;++ @Editable+ @Override+ public boolean isRunInContainer() {+ return true;+ }++ @Editable+ @Override+ public abstract String getImage();++ @Override+ public boolean isUseTTY() {+ return true;+ }++ @Override+ public String getRunAs() {+ return "0:0";+ }++ @Editable(order=1000, name="Certificates to Trust", group = "More Settings", placeholder = "Base64 encoded PEM format, starting with " ++ "-----BEGIN CERTIFICATE----- and ending with -----END CERTIFICATE-----",+ description = "Specify certificates to trust if you are using self-signed certificates for your docker registries")+ @Multiline(monospace = true)+ @Interpolative(variableSuggester="suggestVariables")+ public String getTrustCertificates() {+ return trustCertificates;+ }++ public void setTrustCertificates(String trustCertificates) {+ this.trustCertificates = trustCertificates;+ }++ @Editable(order=1100, group="More Settings", description="Optionally specify registry logins to override " ++ "those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " ++ "<code>@job_token@</code> for user name, and access token secret for password secret")+ @Override+ public List<RegistryLogin> getRegistryLogins() {+ return super.getRegistryLogins();+ }++ @Override+ public void setRegistryLogins(List<RegistryLogin> registryLogins) {+ super.setRegistryLogins(registryLogins);+ }++ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }++ @Override+ public Interpreter getInterpreter() {+ return new PosixInterpreter();+ }++ @Override+ public StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination,+ List<RegistryLoginFacade> registryLogins, Map<String, String> envMap) {+ var commandsBuilder = new StringBuilder();+ if (jobExecutor instanceof DockerAware) {+ DockerAware registryLoginAware = (DockerAware) jobExecutor;+ commandsBuilder.append("mkdir -p /root/.docker\n");+ commandsBuilder.append("cat <<'EOF' > /root/.docker/config.json\n");+ var mergedRegistryLogins = merge(registryLogins, registryLoginAware.getRegistryLogins(jobToken));+ var configMap = new HashMap<String, Object>();+ configMap.put("auths", buildAuthConfig(mergedRegistryLogins));+ try {+ commandsBuilder.append(new ObjectMapper().writeValueAsString(configMap)).append("\n");+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ commandsBuilder.append("EOF\n");+ }+ if (getTrustCertificates() != null) {+ commandsBuilder.append("cat <<'EOF' > /root/trust-certs.crt\n");+ commandsBuilder.append(getTrustCertificates().replace("\r\n", "\n")).append("\n");+ commandsBuilder.append("EOF\n");+ commandsBuilder.append("export SSL_CERT_FILE=/root/trust-certs.crt\n");+ }+ commandsBuilder.append(getCommand());+ return new CommandFacade(getEffectiveImage(), getRunAs(), registryLogins,+ envMap, isUseTTY(), commandsBuilder.toString());+ }++ protected abstract String getCommand();++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.javaindex cb04ebca32..554c7948b0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java@@ -1,39 +1,31 @@package io.onedev.server.buildspec.step;import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;-import static java.util.stream.Collectors.toList;-import java.util.ArrayList;-import java.util.List;--import jakarta.validation.Valid;import jakarta.validation.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.k8shelper.RunImagetoolsFacade;-import io.onedev.k8shelper.StepFacade;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;-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.administration.DockerAware;-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;-import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;@Editable(order=230, name="Run Buildx Image Tools", group = DOCKER_IMAGE, description="Run docker buildx imagetools " +- "command with specified arguments. This step can only be executed by server docker executor " +- "or remote docker executor")-public class RunImagetoolsStep extends Step {+ "inside a container with specified arguments. This step can be executed by server docker executor, " ++ "remote docker executor, or Kubernetes executor")+public class RunImagetoolsStep extends RegistryToolStep {private static final long serialVersionUID = 1L;-+private String arguments;-- private List<RegistryLogin> registryLogins = new ArrayList<>();++ @Editable+ @Override+ public String getImage() {+ return "1dev/buildx:1.0.0";+ }@Editable(order=100, description="Specify arguments for imagetools. For instance " +- "<code>create -t myorg/myrepo:1.0.0 myorg/myrepo@<arm64 manifest digest> myorg/myrepo@<amd64 manifest digest></code>")+ "<code>create -t myorg/myrepo:1.0.0 myorg/myrepo@<arm64 manifest digest> myorg/myrepo@<amd64 manifest digest></code>. " ++ "Local OCI layout paths and file options are relative to the job working directory inside the container. " ++ "Host builder configurations are not available")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getArguments() {@@ -44,30 +36,9 @@ public class RunImagetoolsStep extends Step {this.arguments = arguments;}- @Editable(order=200, group="More Settings", description="Optionally specify registry logins to override " +- "those defined in job executor. For built-in registry, use <code>@server_url@</code> for registry url, " +- "<code>@job_token@</code> for user name, and access token secret for password secret")- public List<@Valid RegistryLogin> getRegistryLogins() {- return registryLogins;- }-- public void setRegistryLogins(List<RegistryLogin> registryLogins) {- this.registryLogins = registryLogins;- }-- static List<InputSuggestion> suggestVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith, true, true, false);- }-- @Override- public StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination) {- var registryLogins = getRegistryLogins().stream().map(it->it.getFacade(build)).collect(toList());- return new RunImagetoolsFacade(getArguments(), registryLogins);- }-@Override- public boolean isApplicable(Build build, JobExecutor executor) {- return executor instanceof DockerAware && !(executor instanceof KubernetesAware);+ public String getCommand() {+ return "docker buildx imagetools " + getArguments();}}diff --git a/server-core/src/test/java/io/onedev/server/buildspec/step/RunImagetoolsStepTest.java b/server-core/src/test/java/io/onedev/server/buildspec/step/RunImagetoolsStepTest.javanew file mode 100644index 0000000000..ce684ebbc1--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/buildspec/step/RunImagetoolsStepTest.java@@ -0,0 +1,124 @@+package io.onedev.server.buildspec.step;++import static java.nio.charset.StandardCharsets.UTF_8;+import static org.junit.jupiter.api.Assertions.*;+import static org.mockito.Mockito.*;++import java.util.ArrayList;+import java.util.Base64;+import java.util.Collection;+import java.util.List;+import java.util.Map;++import org.junit.jupiter.api.Test;++import com.fasterxml.jackson.databind.ObjectMapper;++import io.onedev.commons.loader.AppLoader;+import io.onedev.commons.loader.AppLoaderMocker;+import io.onedev.commons.loader.ImplementationRegistry;+import io.onedev.k8shelper.CommandFacade;+import io.onedev.k8shelper.RegistryLoginFacade;+import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.data.migration.MigrationHelper;+import io.onedev.server.data.migration.VersionedYamlDoc;+import io.onedev.server.model.support.administration.DockerAware;+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;++class RunImagetoolsStepTest extends AppLoaderMocker {++ @Override+ protected void setup() {+ when(AppLoader.getInstance(ImplementationRegistry.class)).thenReturn(new ImplementationRegistry() {+ @Override+ public <T> Collection<Class<? extends T>> getImplementations(Class<T> type) {+ var implementations = new ArrayList<Class<? extends T>>();+ if (type.isAssignableFrom(RunImagetoolsStep.class))+ implementations.add(RunImagetoolsStep.class.asSubclass(type));+ return implementations;+ }+ });+ }++ @Override+ protected void teardown() {+ }++ @Test+ void usesContainerCommandForLocalOciAndFileOptions() {+ var step = new RunImagetoolsStep();+ step.setArguments("create -f 'descriptor file.json' --metadata-file metadata.json "+ + "-t oci-layout://combined:latest oci-layout://amd64:latest oci-layout://arm64:latest");+ // Inherited command settings cannot turn this into host execution.+ step.setRunInContainer(false);+ step.setImage("another-image");+ var facade = assertInstanceOf(CommandFacade.class, step.getFacade(null, null, "token", null));+ assertEquals("1dev/buildx:1.0.0", facade.getImage());+ assertEquals("sh", facade.getExecutable());+ assertEquals("docker buildx imagetools " + step.getArguments(), facade.getCommands());+ assertTrue(step.isApplicable(null, mock(JobExecutor.class, withSettings().extraInterfaces(DockerAware.class))));+ assertTrue(step.isApplicable(null, mock(JobExecutor.class, withSettings().extraInterfaces(KubernetesAware.class))));+ assertFalse(step.isApplicable(null, mock(JobExecutor.class)));+ }++ @Test+ void sharesRegistryOverridesAndTrustCertificatesWithCrane() throws Exception {+ var executor = mock(JobExecutor.class, withSettings().extraInterfaces(DockerAware.class));+ when(((DockerAware) executor).getRegistryLogins("token")).thenReturn(List.of(+ new RegistryLoginFacade("registry.example", "executor", "executor-password"),+ new RegistryLoginFacade("other.example", "other", "other-password")));+ var logins = List.of(new RegistryLoginFacade("registry.example", "job", "$literal-password"));+ var imagetools = new RunImagetoolsStep();+ imagetools.setArguments("inspect oci-layout://image:latest");+ var pull = new PullImageStep();+ pull.setSrcImage("registry.example/image:latest");+ pull.setDestPath("image");+ var push = new PushImageStep();+ push.setSrcPath("image");+ push.setDestImage("registry.example/image:latest");+ for (var step : List.of(imagetools, pull, push)) {+ step.setTrustCertificates("-----BEGIN CERTIFICATE-----\r\ncertificate\r\n-----END CERTIFICATE-----");+ var facade = (CommandFacade) step.getFacade(null, executor, "token", null, logins, Map.of("EXAMPLE", "value"));+ var commands = facade.getCommands();+ var configPrefix = "cat <<'EOF' > /root/.docker/config.json\n";+ var configStart = commands.indexOf(configPrefix) + configPrefix.length();+ assertTrue(commands.contains(configPrefix));+ var auths = new ObjectMapper().readTree(commands.substring(configStart, commands.indexOf("\nEOF", configStart))).get("auths");+ assertEquals(2, auths.size());+ assertEquals("job:$literal-password", new String(Base64.getDecoder().decode(auths.get("registry.example").get("auth").asText()), UTF_8));+ assertEquals("other:other-password", new String(Base64.getDecoder().decode(auths.get("other.example").get("auth").asText()), UTF_8));+ assertTrue(commands.contains("cat <<'EOF' > /root/trust-certs.crt\n-----BEGIN CERTIFICATE-----\ncertificate\n-----END CERTIFICATE-----\nEOF\nexport SSL_CERT_FILE=/root/trust-certs.crt\n"));+ assertTrue(commands.endsWith(step.getCommand()));+ assertEquals(logins, facade.getRegistryLogins());+ assertEquals(Map.of("EXAMPLE", "value"), facade.getEnvMap());+ assertEquals(step instanceof CraneStep ? "1dev/crane:1.0.0" : "1dev/buildx:1.0.0", facade.getImage());+ }+ }++ @Test+ void preservesExistingBuildSpecArgumentsAndRegistryLogins() {+ var yaml = """+ version: %s+ jobs:+ - name: image+ steps:+ - type: RunImagetoolsStep+ name: manifest+ arguments: create -t registry.example/image:latest registry.example/image:amd64+ registryLogins:+ - registryUrl: registry.example+ userName: job+ passwordSecret: registry-password+ """.formatted(MigrationHelper.getVersion(BuildSpec.class));+ BuildSpec spec = VersionedYamlDoc.fromYaml(yaml).toBean(BuildSpec.class);+ BuildSpec restored = VersionedYamlDoc.fromYaml(VersionedYamlDoc.fromBean(spec).toYaml()).toBean(BuildSpec.class);+ var step = assertInstanceOf(RunImagetoolsStep.class, restored.getJobs().get(0).getSteps().get(0));+ assertEquals("create -t registry.example/image:latest registry.example/image:amd64", step.getArguments());+ assertEquals("registry.example", step.getRegistryLogins().get(0).getRegistryUrl());+ assertEquals("job", step.getRegistryLogins().get(0).getUserName());+ assertEquals("registry-password", step.getRegistryLogins().get(0).getPasswordSecret());+ assertTrue(step.isRunInContainer());+ assertEquals("1dev/buildx:1.0.0", step.getImage());+ }+}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 724308aa48..8a2e3d5e95 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@@ -74,7 +74,6 @@ import io.onedev.k8shelper.LeafFacade;import io.onedev.k8shelper.PruneBuilderCacheFacade;import io.onedev.k8shelper.RegistryLoginFacade;import io.onedev.k8shelper.RunContainerFacade;-import io.onedev.k8shelper.RunImagetoolsFacade;import io.onedev.k8shelper.ServiceFacade;import io.onedev.k8shelper.SetupCacheFacade;import io.onedev.server.OneDev;@@ -801,7 +800,7 @@ public class KubernetesExecutor extends JobExecutor implements KubernetesAware,} 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");- } else if (facade instanceof RunContainerFacade || facade instanceof RunImagetoolsFacade+ } else if (facade instanceof RunContainerFacade|| facade instanceof PruneBuilderCacheFacade) {throw new ExplicitException("This step can only be executed by server docker executor or " +"remote docker executor");diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 8c3dc703be..7164f80a86 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@@ -53,7 +53,6 @@ import io.onedev.k8shelper.LeafHandler;import io.onedev.k8shelper.PruneBuilderCacheFacade;import io.onedev.k8shelper.RegistryLoginFacade;import io.onedev.k8shelper.RunContainerFacade;-import io.onedev.k8shelper.RunImagetoolsFacade;import io.onedev.k8shelper.ServerSideFacade;import io.onedev.k8shelper.ServerStepResult;import io.onedev.k8shelper.SetupCacheFacade;@@ -507,14 +506,6 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, TeisAlwaysPullImage(), jobLogger);return null;});- } else if (facade instanceof RunImagetoolsFacade) {- var runImagetoolsFacade = (RunImagetoolsFacade) facade;- var docker = newDocker();- var registryLogins = merge(runImagetoolsFacade.getRegistryLogins(), getRegistryLogins(jobToken));- callWithRegistryLogins(docker, registryLogins, () -> {- JobUtils.runImagetools(docker, runImagetoolsFacade, buildDir, jobLogger);- return null;- });} else if (facade instanceof PruneBuilderCacheFacade) {var pruneBuilderCacheFacade = (PruneBuilderCacheFacade) facade;var docker = newDocker();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 bcd7bf0320..20bd0a9799 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@@ -45,7 +45,6 @@ import io.onedev.k8shelper.LeafFacade;import io.onedev.k8shelper.LeafHandler;import io.onedev.k8shelper.PruneBuilderCacheFacade;import io.onedev.k8shelper.RunContainerFacade;-import io.onedev.k8shelper.RunImagetoolsFacade;import io.onedev.k8shelper.ServerSideFacade;import io.onedev.k8shelper.ServerStepResult;import io.onedev.k8shelper.SetupCacheFacade;@@ -225,7 +224,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<Testablreturn false;}} else if (facade instanceof BuildImageFacade || facade instanceof RunContainerFacade- || facade instanceof RunImagetoolsFacade || facade instanceof PruneBuilderCacheFacade) {+ || facade instanceof PruneBuilderCacheFacade) {throw new ExplicitException("This step can only be executed by server docker executor or "+ "remote docker executor");} else if (facade instanceof CheckoutFacade) {