Merged
Conversation
Fixes JcloudsLoginLiveTest.testSpecifyingPasswordWhenNoDefaultKeyFilesExistWithRootUser
A test for JcloudsLocation provisioning (and WinRM’ing to) a Windows VM. Deletes the old AwsEc2LocationWindowsLiveTest, which was massively out of date and wrong.
Previously it only passed a small selection of the config to the child location. But if you passed additional ssh config values in the `provisioning.properties` then they wouldn’t get passed through.
neykov
reviewed
Sep 26, 2016
| JcloudsWinRmMachineLocation machine = obtainWinrmMachine(MutableMap.<String,Object>builder() | ||
| .putIfAbsent("inboundPorts", ImmutableList.of(5986, 5985, 3389)) | ||
| .put(JcloudsLocation.IMAGE_NAME_REGEX.getName(), AWS_EC2_IMAGE_NAME_REGEX) | ||
| .put(JcloudsLocation.USE_JCLOUDS_SSH_INIT.getName(), false) |
Member
There was a problem hiding this comment.
We should flip this automatically on windows machines.
Member
|
Re |
Member
|
LGTM, merging. |
asfgit
pushed a commit
that referenced
this pull request
Sep 26, 2016
Fixes for JcloudsLocation See individual commits for details. Copied below for your convenience: ``` commit aba3f09 Author: Aled Sage <aled.sage@gmail.com> Date: Fri Sep 23 21:40:06 2016 +0100 JcloudsLocation: pass relevant config to child machine loc Previously it only passed a small selection of the config to the child location. But if you passed additional ssh config values in the `provisioning.properties` then they wouldn’t get passed through. commit 9c9dd47 Author: Aled Sage <aled.sage@gmail.com> Date: Fri Sep 23 21:25:18 2016 +0100 Add JcloudsWinrmingLiveTest A test for JcloudsLocation provisioning (and WinRM’ing to) a Windows VM. Deletes the old AwsEc2LocationWindowsLiveTest, which was massively out of date and wrong. commit d0d8cf0 Author: Aled Sage <aled.sage@gmail.com> Date: Fri Sep 23 19:07:48 2016 +0100 Mark failing tests as broken in JcloudsLoginLiveTest commit d49441d Author: Aled Sage <aled.sage@gmail.com> Date: Fri Sep 23 19:04:58 2016 +0100 Fix MAP_DEV_RANDOM_TO_DEV_URANDOM for running as root Fixes JcloudsLoginLiveTest.testSpecifyingPasswordWhenNoDefaultKeyFilesExistWithRootUser ```
aledsage
deleted the
fix-JcloudsLocation-pass-through-config-to-machine
branch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
See individual commits for details. Copied below for your convenience: