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(2646): Do not include parameters from external builds during remote join #432

Merged
merged 3 commits into from
Feb 22, 2022
Merged

fix(2646): Do not include parameters from external builds during remote join #432

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
492be64
fix(2646): Do not include parameters from external builds during remo…
sagar1312 Feb 17, 2022
2043753
fix(2646): Deep copy parent build meta before deleting the parameters
sagar1312 Feb 18, 2022
39c6cd9
fix(2646): use parent build meta without parameters
sagar1312 Feb 19, 2022
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
3 changes: 3 additions & 0 deletions launch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@ func SetExternalMeta(api screwdriver.API, pipelineID, parentBuildID int, mergedM
externalMetaFile := "sd@" + strconv.Itoa(parentJob.PipelineID) + ":" + parentJob.Name + ".json"
writeMetafile(metaSpace, externalMetaFile, metaLog, parentBuild.Meta)
if join {
// Always exclude parameters from external meta
delete(parentBuild.Meta, "parameters")

resultMeta = deepMergeJSON(resultMeta, parentBuild.Meta)
Copy link
Member

Choose a reason for hiding this comment

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

is this what you meant to do?

Suggested change
resultMeta = deepMergeJSON(resultMeta, parentBuild.Meta)
resultMeta = deepMergeJSON(resultMeta, externalParentBuildMeta)

}

Expand Down