Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[JENKINS-40866] First work on reusing nodes for stage agents
More tests still needed.
- Loading branch information
Showing
8 changed files
with
258 additions
and
50 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
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
56 changes: 56 additions & 0 deletions
56
pipeline-model-definition/src/test/resources/agentDockerDontReuseNode.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,56 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
pipeline { | ||
agent none | ||
|
||
stages { | ||
stage("foo") { | ||
agent { | ||
label "docker" | ||
} | ||
steps { | ||
sh 'ls -la' | ||
sh 'echo "The answer is 42"' | ||
sh 'echo "${NODE_NAME}" > tmp.txt' | ||
} | ||
} | ||
stage("bar") { | ||
agent { | ||
docker { | ||
label "docker" | ||
image "httpd:2.4.12" | ||
reuseNode true | ||
} | ||
} | ||
steps { | ||
sh 'test -f Jenkinsfile' | ||
} | ||
|
||
} | ||
} | ||
} | ||
|
||
|
||
|
54 changes: 54 additions & 0 deletions
54
pipeline-model-definition/src/test/resources/agentDockerReuseNode.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,54 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
pipeline { | ||
agent { | ||
label "docker" | ||
} | ||
stages { | ||
stage("foo") { | ||
steps { | ||
sh 'ls -la' | ||
sh 'echo "The answer is 42"' | ||
sh 'echo "${NODE_NAME}" > tmp.txt' | ||
} | ||
} | ||
stage("bar") { | ||
agent { | ||
docker { | ||
image "httpd:2.4.12" | ||
reuseNode true | ||
} | ||
} | ||
steps { | ||
sh 'test -f Jenkinsfile' | ||
sh 'test -f tmp.txt' | ||
} | ||
|
||
} | ||
} | ||
} | ||
|
||
|
||
|