diff --git a/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/AbstractDockerPipelineScript.groovy b/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/AbstractDockerPipelineScript.groovy
new file mode 100644
index 000000000..dee1cae48
--- /dev/null
+++ b/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/AbstractDockerPipelineScript.groovy
@@ -0,0 +1,73 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+package org.jenkinsci.plugins.pipeline.modeldefinition.agent.impl
+
+import hudson.FilePath
+import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgent
+import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentScript
+import org.jenkinsci.plugins.pipeline.modeldefinition.steps.DeclarativePropsStep
+import org.jenkinsci.plugins.workflow.cps.CpsScript
+
+public abstract class AbstractDockerPipelineScript> extends DeclarativeAgentScript {
+
+ public AbstractDockerPipelineScript(CpsScript s, A a) {
+ super(s, a)
+ }
+
+ @Override
+ public Closure run(Closure body) {
+ if (describable.reuseNode && script.getContext(FilePath.class) != null) {
+ return {
+ configureRegistry(body).call()
+ }
+ } else {
+ String targetLabel = script.declarativeProps(property: DeclarativePropsStep.Property.LABEL,
+ override: describable.label)
+ LabelScript labelScript = (LabelScript) Label.DescriptorImpl.instanceForName("label", [label: targetLabel]).getScript(script)
+ return labelScript.run {
+ configureRegistry(body).call()
+ }
+ }
+ }
+
+ protected Closure configureRegistry(Closure body) {
+ return {
+ String registryUrl = script.declarativeProps(property: DeclarativePropsStep.Property.REGISTRY_URL,
+ override: describable.registryUrl)
+ String registryCreds = script.declarativeProps(property: DeclarativePropsStep.Property.REGISTRY_CREDENTIALS,
+ override: describable.registryCredentialsId)
+ if (registryUrl != null) {
+ script.getProperty("docker").withRegistry(registryUrl, registryCreds) {
+ runImage(body).call()
+ }
+ } else {
+ runImage(body).call()
+ }
+ }
+ }
+
+ protected abstract Closure runImage(Closure body)
+}
\ No newline at end of file
diff --git a/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy b/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy
index 56b93cae5..729854971 100644
--- a/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy
+++ b/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy
@@ -25,53 +25,19 @@
package org.jenkinsci.plugins.pipeline.modeldefinition.agent.impl
-import hudson.FilePath
import hudson.model.Result
import org.jenkinsci.plugins.pipeline.modeldefinition.SyntheticStageNames
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
-import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentScript
-import org.jenkinsci.plugins.pipeline.modeldefinition.steps.DeclarativePropsStep
+
import org.jenkinsci.plugins.workflow.cps.CpsScript
-public class DockerPipelineFromDockerfileScript extends DeclarativeAgentScript {
+public class DockerPipelineFromDockerfileScript extends AbstractDockerPipelineScript {
public DockerPipelineFromDockerfileScript(CpsScript s, DockerPipelineFromDockerfile a) {
super(s, a)
}
@Override
- public Closure run(Closure body) {
- if (describable.reuseNode && script.getContext(FilePath.class) != null) {
- return {
- configureRegistry(body).call()
- }
- } else {
- String targetLabel = script.declarativeProps(property: DeclarativePropsStep.Property.LABEL,
- override: describable.label)
- LabelScript labelScript = (LabelScript) Label.DescriptorImpl.instanceForName("label", [label: targetLabel]).getScript(script)
- return labelScript.run {
- configureRegistry(body).call()
- }
- }
- }
-
- private Closure configureRegistry(Closure body) {
- return {
- String registryUrl = script.declarativeProps(property: DeclarativePropsStep.Property.REGISTRY_URL,
- override: describable.registryUrl)
- String registryCreds = script.declarativeProps(property: DeclarativePropsStep.Property.REGISTRY_CREDENTIALS,
- override: describable.registryCredentialsId)
- if (registryUrl != null) {
- script.getProperty("docker").withRegistry(registryUrl, registryCreds) {
- runImage(body).call()
- }
- } else {
- runImage(body).call()
- }
-
- }
- }
-
public Closure runImage(Closure body) {
return {
def img = null
diff --git a/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy b/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
index 314813b81..925450962 100644
--- a/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
+++ b/pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
@@ -25,52 +25,18 @@
package org.jenkinsci.plugins.pipeline.modeldefinition.agent.impl
-import hudson.FilePath
import hudson.model.Result
import org.jenkinsci.plugins.pipeline.modeldefinition.SyntheticStageNames
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
-import org.jenkinsci.plugins.pipeline.modeldefinition.agent.DeclarativeAgentScript
-import org.jenkinsci.plugins.pipeline.modeldefinition.steps.DeclarativePropsStep
import org.jenkinsci.plugins.workflow.cps.CpsScript
-public class DockerPipelineScript extends DeclarativeAgentScript {
+public class DockerPipelineScript extends AbstractDockerPipelineScript {
public DockerPipelineScript(CpsScript s, DockerPipeline a) {
super(s, a)
}
@Override
- public Closure run(Closure body) {
- if (describable.reuseNode && script.getContext(FilePath.class) != null) {
- return {
- configureRegistry(body).call()
- }
- } else {
- String targetLabel = script.declarativeProps(property: DeclarativePropsStep.Property.LABEL,
- override: describable.label)
- LabelScript labelScript = (LabelScript) Label.DescriptorImpl.instanceForName("label", [label: targetLabel]).getScript(script)
- return labelScript.run {
- configureRegistry(body).call()
- }
- }
- }
-
- private Closure configureRegistry(Closure body) {
- return {
- String registryUrl = script.declarativeProps(property: DeclarativePropsStep.Property.REGISTRY_URL,
- override: describable.registryUrl)
- String registryCreds = script.declarativeProps(property: DeclarativePropsStep.Property.REGISTRY_CREDENTIALS,
- override: describable.registryCredentialsId)
- if (registryUrl != null) {
- script.getProperty("docker").withRegistry(registryUrl, registryCreds) {
- runImage(body).call()
- }
- } else {
- runImage(body).call()
- }
- }
- }
-
public Closure runImage(Closure body) {
return {
if (!Utils.withinAStage()) {