Removes Xenial related parts from codebase #5911
Conversation
|
I updated the Focal Dockerfile to get the layer cache updated. |
|
Should we remove/update the Debian packaging logic in all the packages for making them only |
We should definitely remove the Xenial specific files and conditionals in the build logic where we test for Focal or Xenial, preserving only the Focal path. Our test coverage should detect any issue, provided we remove those as part of a separate commit. If that's too much in this PR, we can handle it in a separate PR. |
|
@kushaldas So far, so good! Heads up you'll need a rebase due to recent changes to CI config in #5907. Other than that, looks straightforward to press on and excise Xenial completely. 👍 |
Ports the deb pkg tests into the focal directory, so the logic is preserved.
We had a few dual-distro packages. The Xenial versions are now removed. The postinst for the single "securedrop-app-code" pkg had some Xenial logic, so that's been removed.
A few scripts have been updated, mostly it's the default for BASE_OS and similar vars that now defaults to Focal. The big change is snipping out all the special cases for Focal within the CircleCI config, and using it by default everywhere.
|
@kushaldas Please take another look. I took the liberty of appending more removals, based on grepping around for "xenial" and similar strings. The results look pretty solid to me. There are a few exemptions that I've intentionally deferred:
Other than that, we should be covered here. If you agree, please mark as ready-for-review, and I'll give it a final close look! |
|
Still can not figure out why are we seeing this particular CI failure due to the
|
|
Looks like CI is passing now—I'll take another look! |
There was a problem hiding this comment.
Pretty complete here, the only missing changes I can point out are some of the EOL strings still present in the JI templates. See comment in-line. Once those changes are made, we'll need to update the strings queued up for translation, to remove the associated strings from the .po. I tried that locally, via make translate, but encountered an error, so I didn't push up any changes. Please take a look and see if you can round it out, @kushaldas.
If you'd prefer to follow up on the strings changes separately, then I'll say explicitly that the rest of the PR looks good to me!
Also updated the translations after updating the journalist interface.
|
@conorsch I just now pushed the change with journalist template update and also updated strings for translation. |
Follow-up to freedomofpress/securedrop#5911, in which we removed Xenial-specific codepaths from the code repo. Here, we do the same throughout the documentation. There are notable exceptions: * https://docs.securedrop.org/en/stable/v3_services.html * https://docs.securedrop.org/en/stable/upgrade/focal_migration.html Those URLs remain untouched by these changes. We can follow up soon with removal for those, too, but it seems helpful to maintain a bit longer.
Follow-up to freedomofpress/securedrop#5911, in which we removed Xenial-specific codepaths from the code repo. Here, we do the same throughout the documentation. There are notable exceptions: * https://docs.securedrop.org/en/stable/v3_services.html * https://docs.securedrop.org/en/stable/upgrade/focal_migration.html Those URLs remain untouched by these changes. We can follow up soon with removal for those, too, but it seems helpful to maintain a bit longer.
Follow-up to freedomofpress/securedrop#5911, in which we removed Xenial-specific codepaths from the code repo. Here, we do the same throughout the documentation. There are notable exceptions: * https://docs.securedrop.org/en/stable/v3_services.html * https://docs.securedrop.org/en/stable/upgrade/focal_migration.html Those URLs remain untouched by these changes. We can follow up soon with removal for those, too, but it seems helpful to maintain a bit longer.
Status
Ready for review.
Description of Changes
Fixes #5725
Removes major
Xenialchanges from the codebase.Testing
Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint) and tests (make test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made changes to the system configuration:
If you added or removed a file deployed with the application:
If you made non-trivial code changes:
Choose one of the following:
If you added or updated a code dependency:
Choose one of the following: