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

Jump to bottom

refactor(triggers): Gate calls to igor from orca #2748

Merged
merged 3 commits into from
Mar 13, 2019
Merged

refactor(triggers): Gate calls to igor from orca #2748

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea481ae
refactor(triggers): Gate calls to igor from orca
ezimanyi Mar 13, 2019
521a1b8
Merge branch 'master' into gate-build-info
ezimanyi Mar 13, 2019
c220e8f
Merge branch 'master' into gate-build-info
ezimanyi Mar 13, 2019
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
12 changes: 7 additions & 5 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 @@ -265,8 +265,14 @@ class OperationsController {
}
}

@Deprecated
private void decorateBuildInfo(Map trigger) {
if (trigger.master && trigger.job && trigger.buildNumber) {
// Echo now adds build information to the trigger before sending it to Orca, and manual triggers now default to
// going through echo (and thus receive build information). We still need this logic to populate build info for
// manual triggers when the 'triggerViaEcho' deck feature flag is off, or to handle users still hitting the old
// API endpoint manually, but we should short-circuit if we already have build info.
if (trigger.master && trigger.job && trigger.buildNumber && !trigger.buildInfo) {
log.info("Populating build information in Orca for trigger {}.", trigger)
def buildInfo
try {
buildInfo = buildService.getBuild(trigger.buildNumber, trigger.master, trigger.job)
Expand Down Expand Up @@ -299,10 +305,6 @@ class OperationsController {
}
}
}
} else if (trigger?.registry && trigger?.repository && trigger?.tag) {
trigger.buildInfo = [
taggedImages: [[registry: trigger.registry, repository: trigger.repository, tag: trigger.tag]]
]
}
}

Expand Down