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.

Sign up for GitHub

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(*): fix startup failure if pipeline templates are not enabled #1792

Merged
merged 1 commit into from
Nov 9, 2017
Merged

fix(*): fix startup failure if pipeline templates are not enabled #1792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/OperationsController.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class OperationsController {
@Autowired
ExecutionRepository executionRepository

@Autowired
@Autowired(required = false)
PipelineTemplateService pipelineTemplateService

@Autowired
Expand Down Expand Up @@ -116,7 +116,7 @@ class OperationsController {
private void parsePipelineTrigger(ExecutionRepository executionRepository, BuildService buildService, Map pipeline) {
if (!(pipeline.trigger instanceof Map)) {
pipeline.trigger = [:]
if (pipeline.plan && pipeline.type == "templatedPipeline") {
if (pipeline.plan && pipeline.type == "templatedPipeline" && pipelineTemplateService != null) {
// If possible, initialize the config with a previous execution trigger context, to be able to resolve
// dynamic parameters in jinja expressions
try {
Expand Down