Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #93 from abayer/jenkins-40866
[JENKINS-40866] Docker agent in stage can reuse global node
- Loading branch information
Showing
9 changed files
with
302 additions
and
87 deletions.
There are no files selected for viewing
85 changes: 85 additions & 0 deletions
85
...c/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/AbstractDockerAgent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| import org.kohsuke.stapler.DataBoundSetter; | ||
|
|
||
| import javax.annotation.CheckForNull; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| public abstract class AbstractDockerAgent<D extends AbstractDockerAgent<D>> extends DeclarativeAgent<D> { | ||
| protected String label; | ||
| protected String args = ""; | ||
| protected String registryUrl; | ||
| protected String registryCredentialsId; | ||
| protected boolean reuseNode; | ||
|
|
||
| public @Nullable | ||
| String getRegistryUrl() { | ||
| return registryUrl; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setRegistryUrl(String registryUrl) { | ||
| this.registryUrl = registryUrl; | ||
| } | ||
|
|
||
| public @Nullable String getRegistryCredentialsId() { | ||
| return registryCredentialsId; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setRegistryCredentialsId(String registryCredentialsId) { | ||
| this.registryCredentialsId = registryCredentialsId; | ||
| } | ||
|
|
||
| public boolean getReuseNode() { | ||
| return reuseNode; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setReuseNode(boolean reuseNode) { | ||
| this.reuseNode = reuseNode; | ||
| } | ||
|
|
||
| public @CheckForNull | ||
| String getLabel() { | ||
| return label; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setLabel(String label) { | ||
| this.label = label; | ||
| } | ||
|
|
||
| public @CheckForNull String getArgs() { | ||
| return args; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setArgs(String args) { | ||
| this.args = args; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
...jenkinsci/plugins/pipeline/modeldefinition/agent/impl/AbstractDockerPipelineScript.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.