Permalink
Please
sign in to comment.
Browse files
[JENKINS-40909] Ensure serial form compatibility of executions.
- Loading branch information
Showing
with
175 additions
and 16 deletions.
- +3 −3 pom.xml
- +3 −1 src/main/java/org/jenkinsci/plugins/workflow/steps/CatchErrorStep.java
- +3 −1 src/main/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStep.java
- +3 −1 src/main/java/org/jenkinsci/plugins/workflow/steps/EnvStep.java
- +3 −1 src/main/java/org/jenkinsci/plugins/workflow/steps/PushdStep.java
- +3 −1 src/main/java/org/jenkinsci/plugins/workflow/steps/RetryStepExecution.java
- +1 −2 src/main/java/org/jenkinsci/plugins/workflow/steps/SleepStep.java
- +4 −3 src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java
- +1 −2 src/main/java/org/jenkinsci/plugins/workflow/steps/WaitForConditionStep.java
- +3 −1 src/main/java/org/jenkinsci/plugins/workflow/steps/WithContextStep.java
- +2 −0 src/test/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStepTest.java
- +2 −0 src/test/java/org/jenkinsci/plugins/workflow/steps/EnvStepRunTest.java
- +14 −0 src/test/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest.java
- +3 −0 src/test/java/org/jenkinsci/plugins/workflow/steps/WaitForConditionStepTest.java
- +1 −0 ...urces/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/3.log
- +1 −0 ...urces/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/5.log
- +37 −0 ...s/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/build.xml
- +6 −0 ...sources/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/log
- BIN ...org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/program.dat
- +7 −0 .../jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/2.xml
- +18 −0 .../jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/3.xml
- +16 −0 .../jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/4.xml
- +18 −0 .../jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/5.xml
- +15 −0 ...resources/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/config.xml
- +1 −0 ...rces/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/nextBuildNumber
- +7 −0 ...rkflow/steps/TimeoutStepTest/serialForm/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml
@@ -0,0 +1 @@ | ||
Timeout set to expire in 27,397 yr |
@@ -0,0 +1 @@ | ||
Sleeping for 2 min 0 sec |
@@ -0,0 +1,37 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<flow-build plugin="workflow-job@1.4.3"> | ||
<actions> | ||
<hudson.model.CauseAction> | ||
<causes> | ||
<hudson.model.Cause_-UserIdCause/> | ||
</causes> | ||
</hudson.model.CauseAction> | ||
</actions> | ||
<queueId>1</queueId> | ||
<timestamp>1484006053835</timestamp> | ||
<startTime>1484006053839</startTime> | ||
<duration>0</duration> | ||
<keepLog>false</keepLog> | ||
<execution class="org.jenkinsci.plugins.workflow.cps.CpsFlowExecution"> | ||
<result>SUCCESS</result> | ||
<script>timeout(time: 9999999, unit: 'DAYS') { | ||
sleep time: 2, unit: 'MINUTES' | ||
} | ||
</script> | ||
<loadedScripts class="map"/> | ||
<owner class="flow-owner"> | ||
<job>timeout</job> | ||
<id>1</id> | ||
</owner> | ||
<iota>5</iota> | ||
<head>1:5</head> | ||
<start>2</start> | ||
</execution> | ||
<logsToCopy class="linked-hash-map"> | ||
<entry> | ||
<string>5</string> | ||
<long>25</long> | ||
</entry> | ||
</logsToCopy> | ||
<checkouts class="hudson.util.PersistedList"/> | ||
</flow-build> |
@@ -0,0 +1,6 @@ | ||
Started by user [8mha:AAAAlh+LCAAAAAAAAP9b85aBtbiIQTGjNKU4P08vOT+vOD8nVc83PyU1x6OyILUoJzMv2y+/JJUBAhiZGBgqihhk0NSjKDWzXb3RdlLBUSYGJk8GtpzUvPSSDB8G5tKinBIGIZ+sxLJE/ZzEvHT94JKizLx0a6BxUmjGOUNodHsLgAzOEgYu/dLi1CL9vNKcHACFIKlWvwAAAA==[0manonymous | ||
Running: Enforce time limit : Start | ||
Timeout set to expire in 27,397 yr | ||
Running: Enforce time limit : Body : Start | ||
Running: Sleep | ||
Sleeping for 2 min 0 sec |
Binary file not shown.
@@ -0,0 +1,7 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag plugin="workflow-support@1.4.3"> | ||
<node class="org.jenkinsci.plugins.workflow.graph.FlowStartNode" plugin="workflow-api@2.8"> | ||
<parentIds/> | ||
<id>2</id> | ||
</node> | ||
</org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag> |
@@ -0,0 +1,18 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag plugin="workflow-support@1.4.3"> | ||
<node class="org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode" plugin="workflow-cps@1.4.3"> | ||
<parentIds> | ||
<string>2</string> | ||
</parentIds> | ||
<id>3</id> | ||
<descriptorId>org.jenkinsci.plugins.workflow.steps.TimeoutStep</descriptorId> | ||
</node> | ||
<actions> | ||
<org.jenkinsci.plugins.workflow.support.actions.LogActionImpl> | ||
<charset>UTF-8</charset> | ||
</org.jenkinsci.plugins.workflow.support.actions.LogActionImpl> | ||
<org.jenkinsci.plugins.workflow.actions.TimingAction plugin="workflow-api@2.8"> | ||
<startTime>1484006054796</startTime> | ||
</org.jenkinsci.plugins.workflow.actions.TimingAction> | ||
</actions> | ||
</org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag> |
@@ -0,0 +1,16 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag plugin="workflow-support@1.4.3"> | ||
<node class="org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode" plugin="workflow-cps@1.4.3"> | ||
<parentIds> | ||
<string>3</string> | ||
</parentIds> | ||
<id>4</id> | ||
<descriptorId>org.jenkinsci.plugins.workflow.steps.TimeoutStep</descriptorId> | ||
</node> | ||
<actions> | ||
<org.jenkinsci.plugins.workflow.actions.BodyInvocationAction plugin="workflow-api@2.8"/> | ||
<org.jenkinsci.plugins.workflow.actions.TimingAction plugin="workflow-api@2.8"> | ||
<startTime>1484006054823</startTime> | ||
</org.jenkinsci.plugins.workflow.actions.TimingAction> | ||
</actions> | ||
</org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag> |
@@ -0,0 +1,18 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag plugin="workflow-support@1.4.3"> | ||
<node class="org.jenkinsci.plugins.workflow.cps.nodes.StepAtomNode" plugin="workflow-cps@1.4.3"> | ||
<parentIds> | ||
<string>4</string> | ||
</parentIds> | ||
<id>5</id> | ||
<descriptorId>org.jenkinsci.plugins.workflow.steps.SleepStep</descriptorId> | ||
</node> | ||
<actions> | ||
<org.jenkinsci.plugins.workflow.support.actions.LogActionImpl> | ||
<charset>UTF-8</charset> | ||
</org.jenkinsci.plugins.workflow.support.actions.LogActionImpl> | ||
<org.jenkinsci.plugins.workflow.actions.TimingAction plugin="workflow-api@2.8"> | ||
<startTime>1484006054830</startTime> | ||
</org.jenkinsci.plugins.workflow.actions.TimingAction> | ||
</actions> | ||
</org.jenkinsci.plugins.workflow.support.storage.SimpleXStreamFlowNodeStorage_-Tag> |
@@ -0,0 +1,15 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<flow-definition plugin="workflow-job@1.4.3"> | ||
<actions/> | ||
<description></description> | ||
<keepDependencies>false</keepDependencies> | ||
<properties/> | ||
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@1.4.3"> | ||
<script>timeout(time: 9999999, unit: 'DAYS') { | ||
sleep time: 2, unit: 'MINUTES' | ||
} | ||
</script> | ||
<sandbox>true</sandbox> | ||
</definition> | ||
<triggers/> | ||
</flow-definition> |
@@ -0,0 +1 @@ | ||
2 |
@@ -0,0 +1,7 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<list> | ||
<flow-owner plugin="workflow-job@1.4.3"> | ||
<job>timeout</job> | ||
<id>1</id> | ||
</flow-owner> | ||
</list> |
0 comments on commit
9ddd3cc