Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FIXED JENKINS-44461] Add beforeAgent flag for when
If true, the when condition will be evaluated before entering the stage's agent (if defined). The default is false - better safe than sorry there.
- Loading branch information
Showing
15 changed files
with
332 additions
and
26 deletions.
There are no files selected for viewing
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
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
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
57 changes: 57 additions & 0 deletions
57
pipeline-model-definition/src/test/resources/json/whenBeforeAgentTrue.json
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,57 @@ | ||
| {"pipeline": { | ||
| "stages": [ | ||
| { | ||
| "name": "One", | ||
| "branches": [ { | ||
| "name": "default", | ||
| "steps": [ { | ||
| "name": "echo", | ||
| "arguments": [ { | ||
| "key": "message", | ||
| "value": { | ||
| "isLiteral": true, | ||
| "value": "Hello" | ||
| } | ||
| }] | ||
| }] | ||
| }] | ||
| }, | ||
| { | ||
| "name": "Two", | ||
| "branches": [ { | ||
| "name": "default", | ||
| "steps": [ { | ||
| "name": "script", | ||
| "arguments": [ { | ||
| "key": "scriptBlock", | ||
| "value": { | ||
| "isLiteral": true, | ||
| "value": "echo \"World\"\n echo \"Heal it\"" | ||
| } | ||
| }] | ||
| }] | ||
| }], | ||
| "agent": { | ||
| "type": "label", | ||
| "argument": { | ||
| "isLiteral": true, | ||
| "value": "here" | ||
| } | ||
| }, | ||
| "when": { | ||
| "conditions": [ { | ||
| "name": "expression", | ||
| "arguments": [ { | ||
| "key": "scriptBlock", | ||
| "value": { | ||
| "isLiteral": true, | ||
| "value": "return getContext(hudson.FilePath) == null" | ||
| } | ||
| }] | ||
| }], | ||
| "beforeAgent": true | ||
| } | ||
| } | ||
| ], | ||
| "agent": {"type": "none"} | ||
| }} |
53 changes: 53 additions & 0 deletions
53
pipeline-model-definition/src/test/resources/whenBeforeAgentFalse.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,53 @@ | ||
| /* | ||
| * 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("One") { | ||
| steps { | ||
| echo "Hello" | ||
| } | ||
| } | ||
| stage("Two") { | ||
| when { | ||
| beforeAgent false | ||
| expression { | ||
| return getContext(hudson.FilePath) != null | ||
| } | ||
| } | ||
| agent { | ||
| label "here" | ||
| } | ||
| steps { | ||
| script { | ||
| echo "World" | ||
| echo "Heal it" | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.