Skip to content

Commit 98150a3

Browse files
committed
no UNKNOWN status for save image
1 parent 8365c4c commit 98150a3

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

src/main/java/com/veertu/plugin/anka/AbstractAnkaSlave.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public AnkaMgmtCloud getCloud() {
3838
protected boolean taskExecuted;
3939
protected boolean saveImageSent;
4040
protected boolean hadProblemsInBuild = false;
41-
protected boolean hadUnknownBuildOutcome = false;
4241

4342
public String getJobNameAndNumber() {
4443
return jobNameAndNumber;
@@ -117,7 +116,7 @@ public void terminate() throws IOException {
117116
LOGGER.log(Level.INFO, AnkaLog.prefix("Node {0} Instance {1} is in state {2}"), new Object[]{getNodeName(), instanceId, vm.getSessionState()});
118117
SaveImageParameters saveImageParams = template.getSaveImageParameters();
119118
if (taskExecuted && saveImageParams != null && this.template.getSaveImageParameters().getSaveImage()
120-
&& saveImageParams.getSaveImage() && !hadProblemsInBuild && !hadUnknownBuildOutcome) {
119+
&& saveImageParams.getSaveImage() && !hadProblemsInBuild) {
121120
LOGGER.log(Level.INFO, AnkaLog.prefix("Node {0} Instance {1}, saving image"), new Object[]{getNodeName(), instanceId});
122121

123122
synchronized (this) {
@@ -202,10 +201,6 @@ public void setHadErrorsOnBuild(boolean value) {
202201
this.hadProblemsInBuild = value;
203202
}
204203

205-
public void setHadUnknownBuildOutcome(boolean value) {
206-
this.hadUnknownBuildOutcome = value;
207-
}
208-
209204
public void setDescription(String jobAndNumber) {
210205
StringBuilder description = new StringBuilder();
211206
description.append(String.format("master image: %s,\n job name and build number: %s,\n",
@@ -305,7 +300,7 @@ public boolean isSchedulingOrPulling() {
305300
public void taskCompleted(Executor executor, Queue.Task task, long durationMS) {
306301
this.setTaskExecuted(true);
307302
SaveImageParameters saveImageParams = template.getSaveImageParameters();
308-
if (!hadProblemsInBuild && !hadUnknownBuildOutcome && saveImageParams != null
303+
if (!hadProblemsInBuild && saveImageParams != null
309304
&& this.template.getSaveImageParameters().getSaveImage() &&
310305
saveImageParams.getSaveImage()) {
311306
AnkaMgmtCloud.markFuture(cloud, this);

src/main/java/com/veertu/plugin/anka/AnkaCloudComputer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public void taskAccepted(Executor executor, Queue.Task task) {
117117
super.taskAccepted(executor, task);
118118
this.run = null;
119119
this.acceptedRunIdentity = null;
120-
this.slave.setHadUnknownBuildOutcome(false);
121120
if (task instanceof ExecutorStepExecution.PlaceholderTask) {
122121
this.run = ((ExecutorStepExecution.PlaceholderTask) task).run();
123122
if (this.run != null ){
@@ -301,7 +300,6 @@ private Result resolveResult(Run<?, ?> completedRun) {
301300

302301
private void applyBuildOutcome(BuildOutcome buildOutcome) {
303302
this.slave.setHadErrorsOnBuild(shouldMarkBuildAsErrorForKeepAlive(buildOutcome));
304-
this.slave.setHadUnknownBuildOutcome(buildOutcome == BuildOutcome.UNKNOWN);
305303
}
306304

307305
static BuildOutcome resolveBuildOutcome(Result result) {

0 commit comments

Comments
 (0)