[JENKINS-69304] Allow specifying a java path #766
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lemeurherve
commented
Aug 17, 2022
| final String jvmopts = node.jvmopts; | ||
| final String remoteFS = WindowsUtil.quoteArgument(node.getRemoteFS()); | ||
| final String workDir = Util.fixEmptyAndTrim(remoteFS) != null ? remoteFS : tmpDir; | ||
| final String launchString = "java " + (jvmopts != null ? jvmopts : "") + " -jar " + tmpDir + AGENT_JAR + " -workDir " + workDir; | ||
| final String launchString = javaPath + " " + (jvmopts != null ? jvmopts : "") + " -jar " + tmpDir + AGENT_JAR + " -workDir " + workDir; |
There was a problem hiding this comment.
Note: unlike the Mac & Unix versions, this launcher doesn't allow specifying command prefix or suffix
lemeurherve
commented
Aug 17, 2022
| @@ -510,6 +520,7 @@ public SlaveTemplate(String ami, String zone, SpotConfiguration spotConfig, Stri | |||
| monitoring, t2Unlimited, ConnectionStrategy.backwardsCompatible(usePrivateDnsName, connectUsingPublicIp, associatePublicIp), -1); | |||
| } | |||
|
|
|||
| @Deprecated | |||
There was a problem hiding this comment.
Added these @Deprecated annotations to what seem to me similar deprecated constructors. (I might be wrong)
|
@fcojfernandez would you have time to review this? Thanks. |
lemeurherve
added a commit
to jenkins-infra/docker-jenkins-weeklyci
that referenced
this pull request
Aug 18, 2022
|
Manually tested an incremental on infra.ci.jenkins.io ✅ |
lemeurherve
added a commit
to jenkins-infra/docker-jenkins-weeklyci
that referenced
this pull request
Aug 18, 2022
* chore: try ec2-plugin with `javaPath` option Ref: jenkinsci/ec2-plugin#766 * include last fix and dependencies needed for this incremental ec2-plugin version (https://plugins.jenkins.io/ec2/#dependencies) * remove plugins already present * fix bounty-castle dependency Plugin workflow-basic-steps:991.v43d80fea_ff66 (via mailer:438.v02c7f0a_12fa_4->instance-identity:116.vf8f487400980) depends on bouncycastle-api:2.26, but there is an older version defined on the top level - bouncycastle-api:2.25 * fix more dependencies * fix incremental syntax * no .workflow (?) * add missing incremental branch ref * drop ec2 prefix from the incremental version Co-authored-by: Devin Nusbaum <dwnusbaum@users.noreply.github.com> * more dependency fixes Co-authored-by: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
lemeurherve
pushed a commit
to lemeurherve/kubernetes-management
that referenced
this pull request
Aug 18, 2022
Should fix Windows (which can't have command prefix) Ref: - jenkinsci/ec2-plugin#766 - jenkins-infra/helpdesk#3090 - jenkins-infra/docker-jenkins-weeklyci#565
lemeurherve
added a commit
to jenkins-infra/kubernetes-management
that referenced
this pull request
Aug 18, 2022
* fix: use ec2-plugin 'javaPath' option instead of command prefix Should fix Windows (which can't have command prefix) Ref: - jenkinsci/ec2-plugin#766 - jenkins-infra/helpdesk#3090 - jenkins-infra/docker-jenkins-weeklyci#565 * fix: use slash instead of antislash for Windows paths * add missing .exe extension for the Windows javaPath
lemeurherve
added a commit
to jenkins-infra/docker-jenkins-weeklyci
that referenced
this pull request
Aug 25, 2022
As jenkinsci/ec2-plugin#766 has been merged, this PR revert the incremental introduced in #565
|
Hi, all very nice. But if you keep 'javaPath' empty (like me) I expect the system does a 'which java' to selfdetect the java binary. |
6 tasks
Has the 2.0.1 version resolved this for you? |
Yes it did. Thanks for the quick fix. |
lemeurherve
added a commit
to lemeurherve/kubernetes-management
that referenced
this pull request
Aug 31, 2022
…ins-infra#2721) * fix: use ec2-plugin 'javaPath' option instead of command prefix Should fix Windows (which can't have command prefix) Ref: - jenkinsci/ec2-plugin#766 - jenkins-infra/helpdesk#3090 - jenkins-infra/docker-jenkins-weeklyci#565 * fix: use slash instead of antislash for Windows paths * add missing .exe extension for the Windows javaPath
lemeurherve
added a commit
to lemeurherve/kubernetes-management
that referenced
this pull request
Sep 1, 2022
…ins-infra#2721) * fix: use ec2-plugin 'javaPath' option instead of command prefix Should fix Windows (which can't have command prefix) Ref: - jenkinsci/ec2-plugin#766 - jenkins-infra/helpdesk#3090 - jenkins-infra/docker-jenkins-weeklyci#565 * fix: use slash instead of antislash for Windows paths * add missing .exe extension for the Windows javaPath
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cf https://issues.jenkins.io/browse/JENKINS-69304 and jenkins-infra/helpdesk#3090, this PR add a "javaPath" option.