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

[JENKINS-58362] Also skip detached plugin installation if a *.[jh]pl file exists #4100

Merged
merged 1 commit into from
Jul 11, 2019

Conversation

jglick
Copy link
Member

@jglick jglick commented Jul 5, 2019

Extends #4039 to cover also cases encountered when using plugin-compat-tester. See also #4099.

Without this patch and jenkinsci/jenkins-test-harness#146,

mvn -f ../command-launcher-plugin surefire:test -Djenkins.version=2.184-SNAPSHOT -Dtest=CommandLauncher2Test\#requireApproval

fails and during test startup you can see

INFO	hudson.PluginManager#considerDetachedPlugin: Loading a detached plugin as a dependency: …/command-launcher.jpi

The bug should only affect PCT usage, Jenkinsfile builds against newer core lines, hpi:run, etc.

@jglick jglick added the work-in-progress The PR is under active development, not ready to the final review label Jul 5, 2019
@jglick jglick removed the work-in-progress The PR is under active development, not ready to the final review label Jul 5, 2019
@jglick jglick changed the title Also skip detached plugin installation if a *.[jh]pl file exists [JENKINS-58362] Also skip detached plugin installation if a *.[jh]pl file exists Jul 5, 2019
@jglick jglick requested a review from a team July 9, 2019 18:09
Copy link
Member

@oleg-nenashev oleg-nenashev left a comment

Choose a reason for hiding this comment

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

Fine with me

@jglick jglick added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jul 10, 2019
Copy link
Contributor

@jeffret-b jeffret-b left a comment

Choose a reason for hiding this comment

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

Looks good. I haven't tried testing it out, but it makes sense.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants