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.

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

[FIXED JENKINS-19017] FileParameter - Handle non-null file parameters as different values #889

Closed
wants to merge 4 commits into from

Conversation

oleg-nenashev
Copy link
Member

Scope: FileParameterValue::equals()

According to function docs, "In practice this will always be false, since location should be unique". However, in practice of queued builds location is relative path to file in workspace (which is specified in parameter configs), so that function returns true => Jenkins merges builds even if theirs file parameters are different.

It is not possible to use anything instead of bit-wise file comparison, because different files can be uploaded from same place during manual build submission. It can require much time in long queues...

I propose to consider files as different if they are specified in the build parameters.

PR resolves https://issues.jenkins-ci.org/browse/JENKINS-19017

Signed-off-by: Oleg Nenashev nenashev@synopsys.com

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>
@oleg-nenashev
Copy link
Member Author

Second commit corrects formatting of the legacy code section. Use synopsys-arc-oss@42f0aec to review functionality changes

Previous fix invokes ProcessKiller only for top-level process.
Built-in killRecursive() of WinProcess has been replaced by manual implementation from UnixProcess

Signed-off-by: Oleg Nenashev <nenashev@synopsys.com>
@cloudbees-pull-request-builder

core » jenkins_main_trunk #1212 FAILURE
Looks like there's a problem with this pull request

@oleg-nenashev
Copy link
Member Author

Sorry, I've committed wrong changes to the my local master branch instead of unit tests.
I'll reopen PR

@daniel-beck
Copy link
Member

Is there a reason you did not submit this again?

@oleg-nenashev
Copy link
Member Author

@daniel-beck
No reasons, I've just forgot to override commits.
The fix works well on my installation for about 1 year.

I'll re-submit the PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants