Parallels provider support#29
Parallels provider support#29stevehedrick wants to merge 32 commits intobox-cutter:masterfrom stevehedrick:master
Conversation
…f floppy files from virtualbox where it is needed
… floppy config from virtualbox where its needed.
…s the autounattend is built for bios
|
fixes #28 |
…p with other providers. manual merge on Makefile and every single vagrant template
|
Merged with upstream again. Manual merge on every single vagrant template and the Makefile + added the s3 features to parallels that just showed up. This is getting old. |
Makefile
Outdated
There was a problem hiding this comment.
To be consistent, this should read:
-test -f .keep_known_hosts || rm -f ~/.ssh/known_hosts
|
LGTM. @misheska? |
|
Updated the cleanup on the parallels test for consistency with other box providers as per rasa's suggestion. |
|
double checked and fixed the ssh definition too, as well as fixed copying / pasting fumble on the initial consistency fix to the test build. |
|
I’m working on getting the auto-update logic for Windows 7/Windows 2008R2 and adding the ability to prepare hardware independent images with “sysprep /generalize” and was planning on tackling the parallels integration after that. Adding the new platform explodes the platform target permutations in the Makefile, so I’d also like to spend some time figuring out how to generalize the definitions between vmware, virtualbox and parallels while supporting the ability to only rebuild a target if the defs for it have changed. But currently I don’t have time to sit down and think about how to restructure the Makefile, as I’d like to get auto-update and hardware independence added in first. If you can convince rasa to integrate now for you (and test), I am willing to re-integrate the stuff I’m working on a little later.
|
|
Sorry, I don't have parallels to test with. But I would suggest we simplify our Makefile with a macro: I am testing this change now, and will commit soon. |
|
OK, tested completed, and changes committed in a85d1e1 |
|
Off to update the pull request. |
|
Thanks. I’ll run the integration tests later this week. Sorry, Cloudbees can’t seem to fix my build account so that it is free as this is an open source project, so I’m in the process of writing Chef recipes to move all that infrastructure to be under the box-cutter.com http://box-cutter.com/ domain proper and run in a different cloud. I should have done this before, but it was convenient to use Cloudbees for this project until it stopped working ;-) Then I can open up the build machine infrastructure to team members again sigh
|
|
Thank you guys. The pull request is up to date again with upstream. I also realized I'd left the parallels builds out on the target shortcuts for not specifying the provider, so I added them into the makefile now. |
|
@stevehedrick Your changes look good to me, so trust that they will get merged in soon, and thank you for your efforts, and your patience! |
|
I finally have the upgrade and generalize options sorted. I'll be gradually rolling in this PR by hand as I build all the templates over the next few days. |
|
I seems like this has already been manually merged in. Can we close this PR? |
|
Give it a little bit longer - to me it’s not “done” until it is tested. And now, for the Windows boxes, to me that’s a run of all the trial editions of Windows, which I haven’t yet had time to build because I just moved and I’m waiting for all the box-cutter build machines to come out of storage so I can do that ;-) The movers arrive next weekend, and I should have everything set up to start doing builds again by the weekend after. I’ll close this out then, though yes, as far as I know, the Parallels support is merged in, though I need to test the Windows update part more thoroughly along with it.
|
I've updated all the templates, vagrantfiles, and the makefile to add support for parallels. I have one known issue with it, the parallels tools don't always install correctly. Granted since parallels can't run headless, it's a pretty simple work around to install them manually.