-
Notifications
You must be signed in to change notification settings - Fork 690
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
Bump upgrade testing box to 0.9.1 #3819
Conversation
* read the stable version from a shared file instead of hard-coding it * utilize the exact same file since the logic is the same for both upgrade and vagrant package molecule scenarios
Instead of hard-coding into the molecule.yml file, lets look for an env var that a user can pass when kicking off the scenario. To not affect the vagrant packager logic, fall back to the stable.ver file contents since really we will never been building upgrade boxes from non-stable releases. This also required version changes to the metadata vagrant json files - so the tag targets exactly match the vagrant version targets
I'm not sure the Makefile is the best place for it... this file is getting out of hand - but for now... yep. By default lets start the upgrade scenario from the latest stable.. obviously this will be problematic when we release and there is a lag in publishing the latest baseline VMs but I dont see this as a huge issue. Just gotta get better at updating the boxes post release.
Codecov Report
@@ Coverage Diff @@
## develop #3819 +/- ##
=======================================
Coverage 84.7% 84.7%
=======================================
Files 44 44
Lines 2759 2759
Branches 298 298
=======================================
Hits 2337 2337
Misses 354 354
Partials 68 68 Continue to review full report at Codecov.
|
I can't test this because my version of Vagrant (2.1.1) doesn't work with the Vagrantfile.
And if I comment out that link, I get:
And the error log is:
|
@heartsucker it probably shouldn't be using the vlrtualbox provider, but libvirt. Have you previously done the libvirt conversion dance as described here?: https://docs.securedrop.org/en/release-0.9/development/virtual_environments.html#switch-vagrant-provider-to-libvirt Gonna run through test plan now myself, see if I can get the same error. |
Yeppp - I think @zenmonkeykstop is on the right path. I got a ticket here to add support for virtualbox support (and thus mac OSX and friends) but right now its stuck at libvirt cause my system doesnt support virtualbox (grrrrrrrsec!! shakes fist at sky). |
On Ubuntu 18.04, checked out branch fresh and ran:
This failed for me, saying it couldn't find the tor-hidden-services role. Poked about a bit and changed ANSIBLE_ROLES_PATH in
Updated Then checked securedrop-config versions:
SUCCESS! (with path tweaks as mentioned above, which may just be coz something is weird on my side). |
Because why not makefile all the things at this point!? YAY
At some point in molecule dev, the ephemeral directory was moved from the local scenario dir + `.molecule` to a path in /tmp/molecule/${git_dir}/${scenario_dir} . This is a welcome change EXCEPT that there could be an edge case where someone clones in securedrop without the default `securedrop` dir path. This is problematic because the molecule.yml will not take dynamic interpolation AND its the only spot i could figure out to specify the ansible roles dir. So I wanted to take advantage of the new location of the ephermeral directory while also having a hard-coded roles_dir that wont change. The work around here is moving the git clone to the official molecule ephemeral dir, but using the legacy spot to make a roles symlink. There is some DRY improvements that can obviously be made but since this is already a crazy commit I tried to hold my self back from more refactoring.
yo @zenmonkeykstop you found a super interesting bug that didnt show up on my box due to the way we are git ignoring the I pushed a commit that should fix this and move that SD clone action to /tmp so it should really get wiped upon reboots and we dont have to count on someone running a molecule destroy action. thanks for flagging and let me know if you are still seeing the error on latest branch HEAD here. |
Tested as above on a fresh clone, it completed successfully with the /tmp/molecule change. 👍 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zenmonkeykstop confirms successful test, so merging
Status
Ready for review
Description of Changes
Fixes #3816
Changes proposed in this pull request:
Testing
How should the reviewer test this PR?
First off, this will only work for Linux users with vagrant + libvirt-vagrant installed (sorry @redshiftzero !!). To test:
Deployment
Any special considerations for deployment? Consider both:
Only affects upgrade testing