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(exceptions): fix pipeline template exception #3839

Merged
merged 2 commits into from
Jul 28, 2020
Merged

fix(exceptions): fix pipeline template exception #3839

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49a1490
fix(exceptions): fix pipeline template exception
marchello2000 Jul 28, 2020
2a28aae
Merge branch 'master' into mark/exceptions
mergify[bot] Jul 28, 2020
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 ...roovy/com/netflix/spinnaker/orca/front50/spring/DependentPipelineExecutionListener.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
package com.netflix.spinnaker.orca.front50.spring

import com.netflix.spinnaker.fiat.shared.FiatStatus
import com.netflix.spinnaker.kork.web.exceptions.ValidationException
import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
import com.netflix.spinnaker.orca.api.pipeline.models.PipelineExecution
import com.netflix.spinnaker.orca.exceptions.PipelineTemplateValidationException
import com.netflix.spinnaker.orca.extensionpoint.pipeline.ExecutionPreprocessor
import com.netflix.spinnaker.orca.front50.DependentPipelineStarter
import com.netflix.spinnaker.orca.front50.Front50Service
Expand Down Expand Up @@ -77,7 +77,7 @@ class DependentPipelineExecutionListener implements ExecutionListener {
if (V2Util.isV2Pipeline(pipeline)) {
try {
return V2Util.planPipeline(contextParameterProcessor, executionPreprocessors, pipeline)
} catch (ValidationException ignored) {
} catch (PipelineTemplateValidationException ignored) {
// Really no point in logging this error out here - the user created a bad template, which has no relation
// to the currently executing pipeline
return null
Expand Down