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.

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

Fixes ./securedrop-admin verify command #5674

Merged
merged 1 commit into from
Dec 18, 2020
Merged

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Dec 16, 2020

Status

Ready for review

Description of Changes

Fixes #5659

Improves testinfra molecule scenario check and adds option to run ./securedrop-admin verify against a Focal prod environment

Changes proposed in this pull request:

Testing

libvirt staging scenarios

  • molecule test -s libvirt-staging-focal completes successfully
  • molecule test -s libvirt-staging-xenial completes successfully

prod VMs (with admin virtualenv set up with ./securedrop-admin setup -t)

Focal VMs

  • USE_FOCAL=1 ./securedrop-admin verify completes with expected 8 errors (IP/iptables mismatches) only
  • ./securedrop-admin verify completes with 13 or more errors (IP/iptables mismatches and Python versions)
  • Post-verification message with instructions on restoring non-verification virtualenv is displayed in both cases

Xenial VMs

  • ./securedrop-admin verify completes with expected 8 or fewer errors (IP/iptables mismatches) only
  • Post-verification message with instructions on restoring non-verification virtualenv is displayed in both cases

Deployment

No concerns

Checklist

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

Choose one of the following:

  • I have opened a PR in the docs repo for these changes, or will do so later
  • I would appreciate help with the documentation
  • These changes do not require documentation

@zenmonkeykstop
Copy link
Contributor Author

For focal VM testing, if it hasn't been merged to develop yet the branch in #5669 can be used to set up the environment

@codecov-io
Copy link

codecov-io commented Dec 16, 2020

Codecov Report

Merging #5674 (ae37527) into develop (b61a18e) will decrease coverage by 0.08%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #5674      +/-   ##
===========================================
- Coverage    85.46%   85.38%   -0.09%     
===========================================
  Files           51       51              
  Lines         3709     3709              
  Branches       464      464              
===========================================
- Hits          3170     3167       -3     
- Misses         439      441       +2     
- Partials       100      101       +1     
Impacted Files Coverage Δ
securedrop/source_app/main.py 90.20% <0.00%> (-1.55%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b61a18e...ae37527. Read the comment docs.

@zenmonkeykstop zenmonkeykstop added this to the 1.7.0 milestone Dec 16, 2020
@emkll emkll self-assigned this Dec 17, 2020
- adds support for testing aganst prod Focal environment
- improves error handling in case where tests fail in prod.
@emkll emkll force-pushed the 5659-fix-verify-on-focal branch from 2097750 to ae37527 Compare December 17, 2020 22:35
@emkll
Copy link
Contributor

emkll commented Dec 17, 2020

rebased on latest develop to include changes from #5669

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @zenmonkeykstop went through the test plan and changes are working as expected

@emkll emkll merged commit 405d0cf into develop Dec 18, 2020
@emkll emkll deleted the 5659-fix-verify-on-focal branch December 18, 2020 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dual distro support broke "securedrop-admin verify"
3 participants