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

Server OS can be 16.04 or 20.04 #5604

Merged
merged 1 commit into from
Oct 29, 2020

Conversation

kushaldas
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #5603

The Server OS version can be either 16.04 or 20.04

Testing

  • CI should be green
  • To test on focal, first create a local dummy branch from dev_focal and rebase on top of Updates pytest pluggy testinfra molecule and the universe #5585
  • git rebase -i updates_pytest_pluggy_testinfra_molecule_and_the_universe
  • BASE_OS=focal securedrop/bin/dev-shell bin/run-test -s -v tests/functional/source_navigation_steps.py

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing production instances.
  2. New installs.

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 changes to the system configuration:

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

If you added or updated a code dependency:

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review

@eloquence eloquence changed the title Fixes #5603 server os can be 16.04 or 20.04 Server os can be 16.04 or 20.04 Oct 28, 2020
@eloquence eloquence changed the title Server os can be 16.04 or 20.04 Server OS can be 16.04 or 20.04 Oct 28, 2020
Copy link
Contributor

@rmol rmol left a comment

Choose a reason for hiding this comment

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

👍

I did not follow the test plan, as tests/functional/source_navigation_steps.py is passing on dev_focal (which has been rebased onto develop after the merge of #5585) without this fix. The relevant test failing under Focal on that branch is tests/functional/test_source_metadata.py, and this change does get that passing.

@rmol rmol merged commit 8c86e8e into develop Oct 29, 2020
@rmol rmol deleted the fix_5603_functional_metatdata_for_focal branch October 29, 2020 20:26
@eloquence eloquence added this to the 1.7.0 milestone Jan 5, 2021
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.

tests/functional/test_source_metadata.py::TestInstanceMetadata::test_instance_metadata error on Focal
3 participants