Skip to content

Commit

Permalink
Abstract away big chunks of the DockerPipeline*Scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
abayer committed Jan 18, 2017
1 parent ab5e7cb commit 747764d
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 71 deletions.
@@ -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<A extends DeclarativeAgent<A>> extends DeclarativeAgentScript<A> {

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)
}
Expand Up @@ -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<DockerPipelineFromDockerfile> {
public class DockerPipelineFromDockerfileScript extends AbstractDockerPipelineScript<DockerPipelineFromDockerfile> {

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
Expand Down
Expand Up @@ -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<DockerPipeline> {
public class DockerPipelineScript extends AbstractDockerPipelineScript<DockerPipeline> {

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()) {
Expand Down

0 comments on commit 747764d

Please sign in to comment.