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

Import okay #4151

Merged
merged 2 commits into from
Feb 18, 2019
Merged

Import okay #4151

merged 2 commits into from
Feb 18, 2019

Conversation

kushaldas
Copy link
Contributor

@kushaldas kushaldas commented Feb 18, 2019

Status

Ready for review

Description of Changes

Fixes #4108 .

Changes proposed in this pull request:

Testing

  • Provision prod VMs
  • Submit a document as a source
  • Upgrade to xenial via sudo do-release-upgrade (some nice steps thanks to @zenmonkeykstop here)
  • make build-debs-xenial
  • scp the securedrop-app-code deb into app-staging and install it (you have to install paxctld package before)
  • Upgrade the app server to xenial via do-release-upgrade
  • Submit another document as a source
  • Ensure no gpg-related errors appear in /var/log/apache2/source-error.log

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing production instances.

This should cause no errors in existing production instances.

Checklist

If you made changes to the server application code:

  • Linting (make ci-lint) and tests (make -C securedrop 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

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

redshiftzero and others added 2 commits February 18, 2019 14:06
--batch flag helps to import the gpg keys into gpg2 format
without having the passphrase.
@codecov-io
Copy link

codecov-io commented Feb 18, 2019

Codecov Report

Merging #4151 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #4151   +/-   ##
========================================
  Coverage    84.78%   84.78%           
========================================
  Files           43       43           
  Lines         2780     2780           
  Branches       303      303           
========================================
  Hits          2357     2357           
  Misses         355      355           
  Partials        68       68

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 6b007ba...71ac0eb. Read the comment docs.

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.

Followed test plan, no errors in source-error.log !

  • Provision prod VMs on 0.12.0-rc1
  • Submit a document as a source
  • Upgrade (app server) to xenial via sudo do-release-upgrade (some nice steps thanks to @zenmonkeykstop here)
  • installed securedrop-app-code package from this branch
  • Submit another document as a source
  • Ensure no gpg-related errors appear in /var/log/apache2/source-error.log

@emkll emkll merged commit 03b4a07 into develop Feb 18, 2019
@emkll emkll deleted the import_okay branch February 18, 2019 15:31
@emkll emkll mentioned this pull request Feb 18, 2019
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.

4 participants