Skip to content

Commit

Permalink
Add application to Fast Property created pipelines. (#3255)
Browse files Browse the repository at this point in the history
Application name was missing from the FP created ad-hoc pipelines, causing the url for Manual Judgement stage to
not property render.
  • Loading branch information
zanthrash authored Feb 3, 2017
1 parent a55a693 commit e139650
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/scripts/modules/core/retry/retry.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class RetryService {
interval: number): ng.IPromise<T> {

const call: T | ng.IPromise<T> = func();
const promise: ng.IPromise<T> = call.hasOwnProperty('then') ? call as ng.IPromise<T>: this.$q.resolve(call);
const promise: ng.IPromise<T> = call.hasOwnProperty('then') ? call as ng.IPromise<T> : this.$q.resolve(call);
if (limit === 0) {
return promise;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,22 @@ export class PropertyPipelineBuilderService {

return this.getPipelineConfigId(command)
.then((pipelineConfigId: string) => {
return this.createPropertyPipeline(stages, pipelineConfigId);
return this.createPropertyPipeline(stages, pipelineConfigId, command.applicationName);
});
}

private buildPropertyStage(user: IUser, command: PropertyCommand): PropertyPipelineStage {
return new PropertyPipelineStage(user, command);
}

private createPropertyPipeline(stages: IStage[], pipelineConfigId: string): PropertyPipeline {
private createPropertyPipeline(stages: IStage[], pipelineConfigId: string, applicationName: string): PropertyPipeline {
let pipeline = new PropertyPipeline(pipelineConfigId);
pipeline.keepWaitingPipelines = false;
pipeline.lastModifiedBy = 'spinnaker';
pipeline.limitConcurrent = false;
pipeline.parallel = true;
pipeline.stages = stages;
pipeline.application = applicationName;
return pipeline;
}

Expand Down

0 comments on commit e139650

Please sign in to comment.