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

Restore dropped virtualenv activation in securedrop-admin #4921

Merged
merged 1 commit into from
Oct 17, 2019

Conversation

rmol
Copy link
Contributor

@rmol rmol commented Oct 17, 2019

Status

Ready for review

Description of Changes

Fixes #4920.

Restores dropped virtualenv activation in securedrop-admin.

Testing

Follow the STR in #4920. The last step (raging) should not be required.

Deployment

Fixes securedrop-admin.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made non-trivial code changes:

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

@emkll emkll self-requested a review October 17, 2019 17:26
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 @rmol for the quick fix. Tested as follows:

Tails 3.16 -> 4.0-rc1

Ran the install scripts against prod vms:

  • ran./securedrop-admin install, observed admin/.venv3 deleted, prompted to run ./securedrop-admin setup
  • ./securedrop-admin sdconfig completes successfully
  • ./securedrop-admin setup completes successfully
  • ./securedrop-admin install completes successfully
  • ./securedrop-admin tailsconfig completes successfully (and the desktop shortcuts are functional)
  • ./securedrop-admin backup completes successfully.

Fresh Tails 4.0-rc1 install

Note: did not run to completion due to lack of hardware available at this time, but ensured Ansible was invoked):

  • ./securedrop-admin setup completes successfully
  • ./securedrop-admin sdconfig completes successfully
  • ./securedrop-admin install invokes ansible (but fails due to instance config)
  • ./securedrop-admin tailsconfig invokes ansible (but fails due to lack of instance config)
  • ./securedrop-admin backup invokes ansible (but fails due to lack of instance config)

Good to merge when CI passes.

@emkll
Copy link
Contributor

emkll commented Oct 17, 2019

I am getting an issue with the securedrop GUI updater on this branch (attempting to "upgrade" to 1.0.0):

ERROR: Failed to install pip dependencies. Check network connection and try again.
Update failed. Please contact your SecureDrop administrator.

I think this is unrelated to this PR, but maybe is Tails4-specific?

EDIT: Definitely not related to this PR. Checked out 1.1.0-rc1 and disabled/re-enabled the network, the same issue occurs. This happens after 1.0.0 is checked out, and might be due to tails-4 compatibility not being present in 1.0.0

@emkll
Copy link
Contributor

emkll commented Oct 17, 2019

The updater issue raised in #4921 (comment) is unrelated, it should only pose an issue when upgrading to a SecureDrop version with no Tails 4 support (which shouldn't happen under normal circumstances, once 1.1.0 is released. Merging!

@emkll emkll merged commit 804ff0a into develop Oct 17, 2019
@emkll emkll deleted the 4910-bootstrap-python3-checkenv branch October 17, 2019 20:10
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.

Fixes for 4910 dropped securedrop-admin virtualenv activation
2 participants