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

[JENKINS-57967] Pass SshHostKeyVerificationStrategy to SSHLauncher #104

Merged
merged 3 commits into from
Jul 8, 2019
Merged

[JENKINS-57967] Pass SshHostKeyVerificationStrategy to SSHLauncher #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27a7116
Merge pull request #1 from jenkinsci/master
medianick Jun 26, 2019
ff45421
Pass SshHostKeyVerificationStrategy to SSHLauncher
medianick Jun 26, 2019
97e6954
Bump ssh-slaves to 1.15
medianick Jun 26, 2019
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-slaves</artifactId>
<version>1.11</version>
<version>1.15</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/vSphereCloudSlaveTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ protected Object readResolve() {
final String oldCredentialsIdOrNull = getCredentialsId();
final String oldCredentialsId = oldCredentialsIdOrNull == null ? "" : oldCredentialsIdOrNull;
// these were the old hard-coded settings
this.launcher = new SSHLauncher(null, 0, oldCredentialsId, null, null, null, null, this.launchDelay, 3, 60);
this.launcher = new SSHLauncher(null, 0, oldCredentialsId, null, null, null, null, this.launchDelay, 3, 60, null);
LOGGER.log(Level.CONFIG, " - now configured to use {0}(..., {1}, ...)", new Object[] {
this.launcher.getClass().getSimpleName(), oldCredentialsId });
} catch (Exception ex) {
Expand Down Expand Up @@ -478,7 +478,7 @@ private ComputerLauncher determineLauncher(final VSphere vSphere, final String c
sshLauncher.getCredentialsId(), sshLauncher.getJvmOptions(), sshLauncher.getJavaPath(),
sshLauncher.getPrefixStartSlaveCmd(), sshLauncher.getSuffixStartSlaveCmd(),
sshLauncher.getLaunchTimeoutSeconds(), sshLauncher.getMaxNumRetries(),
sshLauncher.getRetryWaitTime());
sshLauncher.getRetryWaitTime(), sshLauncher.getSshHostKeyVerificationStrategy());
return launcherWithIPAddress;
}
throw new IllegalStateException("Unsupported launcher (" + launcher + ") in template configuration");
Expand Down