Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #5 from jenkinsci/block-step-JENKINS-26107
[JENKINS-26107] stage may now take a block
- Loading branch information
Showing
with
43 additions
and 66 deletions.
- +8 −3 pom.xml
- +4 −0 src/main/java/org/jenkinsci/plugins/workflow/support/steps/StageStep.java
- +9 −1 src/main/java/org/jenkinsci/plugins/workflow/support/steps/StageStepExecution.java
- +0 −3 src/main/resources/org/jenkinsci/plugins/workflow/support/steps/StageStep/config.jelly
- +0 −7 src/main/resources/org/jenkinsci/plugins/workflow/support/steps/StageStep/help-concurrency.html
- +3 −4 src/main/resources/org/jenkinsci/plugins/workflow/support/steps/StageStep/help.html
- +2 −0 src/main/resources/org/jenkinsci/plugins/workflow/support/steps/stage/Messages.properties
- +0 −48 src/test/java/org/jenkinsci/plugins/workflow/support/steps/StageStepConfigTest.java
- +17 −0 src/test/java/org/jenkinsci/plugins/workflow/support/steps/StageStepTest.java
@@ -1,6 +1,5 @@ | ||
<div> | ||
By default, Pipeline builds can run concurrently. | ||
The stage command lets you mark certain sections of a build as being constrained by limited concurrency. | ||
Newer builds are always given priority when entering such a throttled stage; older builds will simply exit early if | ||
they are preempted. | ||
Creates a labeled block. | ||
<p> | ||
An older, deprecated mode of this step did not take a block argument, and accepted a <code>concurrency</code> parameter. | ||
</div> |
@@ -1 +1,3 @@ | ||
StageStepExecution.the_stage_step_must_not_be_used_inside_a=The \u2018stage\u2019 step must not be used inside a \u2018parallel\u2019 block. | ||
StageStepExecution.concurrency_not_supported_in_block_mode=The \u2018concurrency\u2019 parameter is not supported in block-mode \u2018stage\u2019; try \u2018lock\u2019 and/or \u2018milestone\u2019 steps instead | ||
StageStepExecution.non_block_mode_deprecated=Using the \u2018stage\u2019 step without a block argument is deprecated |