Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(orca): if build stage fails and prop file exists, try and fetch #2855

Merged
merged 1 commit into from
Apr 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.netflix.spinnaker.orca.igor.tasks.*;
import com.netflix.spinnaker.orca.pipeline.StageDefinitionBuilder;
import com.netflix.spinnaker.orca.pipeline.TaskNode;
import com.netflix.spinnaker.orca.pipeline.graph.StageGraphBuilder;
import com.netflix.spinnaker.orca.pipeline.model.Stage;
import com.netflix.spinnaker.orca.pipeline.tasks.artifacts.BindProducedArtifactsTask;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -90,4 +91,27 @@ public Result cancel(final Stage stage) {
}
return new Result(stage, new HashMap());
}

@Override
public void onFailureStages(@Nonnull Stage stage, @Nonnull StageGraphBuilder graph) {
CIStageDefinition stageDefinition = stage.mapTo(CIStageDefinition.class);
if (stageDefinition.getPropertyFile() != null && !stageDefinition.getPropertyFile().equals("")) {
log.info(
"Stage failed (stageId: {}, executionId: {}), trying to find requested property file in case it was archived.",
stage.getId(),
stage.getExecution().getId()
);
graph.add( (Stage s) -> {
s.setType(new GetPropertiesStage().getType());
s.setName("Try to get properties file");
Map<String, Object> context = new HashMap<>();
context.put("master", stageDefinition.getMaster());
context.put("job", stageDefinition.getJob());
context.put("propertyFile", stageDefinition.getPropertyFile());
context.put("buildNumber", stageDefinition.getBuildNumber());
s.setContext(context);
}
);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
*
* Copyright 2019 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.netflix.spinnaker.orca.igor.pipeline;

import com.netflix.spinnaker.orca.igor.tasks.GetBuildPropertiesTask;
import com.netflix.spinnaker.orca.pipeline.StageDefinitionBuilder;
import com.netflix.spinnaker.orca.pipeline.TaskNode;
import com.netflix.spinnaker.orca.pipeline.model.Stage;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;

@Component
public class GetPropertiesStage implements StageDefinitionBuilder {
@Override
public void taskGraph(@Nonnull Stage stage, @Nonnull TaskNode.Builder builder) {
builder.withTask("getPropertiesFile", GetBuildPropertiesTask.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ public class GetBuildPropertiesTask extends RetryableIgorTask {
return TaskResult.SUCCEEDED;
}

Map<String, Object> properties = buildService.getPropertyFile(stageDefinition.getBuildNumber(), stageDefinition.getPropertyFile(), stageDefinition.getMaster(), stageDefinition.getJob());
Map<String, Object> properties = buildService.getPropertyFile(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This formatting bothered me so I fixed it.

stageDefinition.getBuildNumber(),
stageDefinition.getPropertyFile(),
stageDefinition.getMaster(),
stageDefinition.getJob()
);
if (properties.size() == 0) {
throw new IllegalStateException(String.format("Expected properties file %s but it was either missing, empty or contained invalid syntax", stageDefinition.getPropertyFile()));
}
Expand Down