-
Notifications
You must be signed in to change notification settings - Fork 128
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 #30 from jglick/AbstractStepExecutionImpl-JENKINS-…
…40909 [JENKINS-40909] Ensure serial form compatibility of executions
- Loading branch information
Showing
26 changed files
with
175 additions
and
16 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
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
1 change: 1 addition & 0 deletions
1
...g/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/3.log
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 @@ | ||
Timeout set to expire in 27,397 yr |
1 change: 1 addition & 0 deletions
1
...g/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/5.log
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 @@ | ||
Sleeping for 2 min 0 sec |
37 changes: 37 additions & 0 deletions
37
...nkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/build.xml
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,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> |
6 changes: 6 additions & 0 deletions
6
...org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/log
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,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 added
BIN
+5.17 KB
...insci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/program.dat
Binary file not shown.
7 changes: 7 additions & 0 deletions
7
...ci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/2.xml
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,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> |
18 changes: 18 additions & 0 deletions
18
...ci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/3.xml
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,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> |
16 changes: 16 additions & 0 deletions
16
...ci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/4.xml
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,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> |
18 changes: 18 additions & 0 deletions
18
...ci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/builds/1/workflow/5.xml
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,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> |
15 changes: 15 additions & 0 deletions
15
...s/org/jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/config.xml
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,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> |
1 change: 1 addition & 0 deletions
1
.../jenkinsci/plugins/workflow/steps/TimeoutStepTest/serialForm/jobs/timeout/nextBuildNumber
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 @@ | ||
2 |
7 changes: 7 additions & 0 deletions
7
...teps/TimeoutStepTest/serialForm/org.jenkinsci.plugins.workflow.flow.FlowExecutionList.xml
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,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> |