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

Add template-consolidation component for buster #65

Merged
merged 4 commits into from
Oct 6, 2020

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Oct 2, 2020

Status

Ready for review

Description of changes

Using a dedicated "component" so that we can isolate ongoing development
specifically on template consolidation work [0] so that we can evaluate
upgrade behavior. While it's frankly acceptable to break "apt-test"
packages temporarily, we need the ability to test before/after states to
evaluate behavior during upgrades. Thus the separate component.

Requires updates to the CD logic that runs on apt-test.

Towards freedomofpress/securedrop-workstation#471

Contains newly built packages based on changes in freedomofpress/securedrop-builder#198

Checklist

Confirming the above, since apt-test is currently tracking this feature branch, is essentially verifying the following apt cache output:

securedrop-proxy:
  Installed: (none)
  Candidate: 0.3.1+buster
  Version table:
     0.3.1+buster 500
        500 https://apt-test.freedom.press buster/template-consolidation amd64 Packages
     0.3.0-dev-20201005-060258+buster 500
        500 https://apt-test.freedom.press buster/main amd64 Packages

except you don't have to mangle your apt sources locally.

@conorsch
Copy link
Contributor Author

conorsch commented Oct 2, 2020

Example from a local container. The package securedrop-workstation-grsec is present in both the "buster/main" component, as usual, and the new "buster/template-consolidation" component, but the newly created package securedrop-workstation-viewer (cf. freedomofpress/securedrop-workstation#615) is available only in "buster/template-consolidation":

root@4c4d15475eb0:/# apt-cache policy securedrop-workstation-grsec
securedrop-workstation-grsec:
  Installed: (none)
  Candidate: 4.14.186+buster2
  Version table:
     4.14.186+buster2 500
        500 https://apt-test.freedom.press buster/main amd64 Packages
        500 https://apt-test.freedom.press buster/template-consolidation amd64 Packages
root@4c4d15475eb0:/# apt-cache policy securedrop-workstation-viewer
securedrop-workstation-viewer:
  Installed: (none)
  Candidate: 0.1.0+buster
  Version table:
     0.1.0+buster 500
        500 https://apt-test.freedom.press buster/template-consolidation amd64 Packages

Hopefully that'll make testing upgrade behavior for consolidation a bit easier.

Conor Schaefer added 4 commits October 5, 2020 17:05
Using a dedicated "component" so that we can isolate ongoing development
specifically on template consolidation work [0] so that we can evaluate
upgrade behavior. While it's frankly acceptable to break "apt-test"
packages temporarily, we need the ability to test before/after states to
evaluate behavior during upgrades. Thus the separate component.

Requires updates to the CD logic that runs on apt-test.
This package supersedes and replaces the
"securedrop-workstation-sd-svs-disp" package, see
freedomofpress/securedrop-workstation#615
Strictly for use with template-consolidation channel, for debugging.
Again, see related PR in:

freedomofpress/securedrop-builder#198
@conorsch
Copy link
Contributor Author

conorsch commented Oct 6, 2020

Marking as ready-for-review. I propose we merge these changes into the apt-test "main" branch, so that we can continue to iterate on packages specifically related to freedomofpress/securedrop-workstation#471 , while preserving the regular apt-test setup in use in many different contexts.

@conorsch conorsch marked this pull request as ready for review October 6, 2020 00:40
@conorsch
Copy link
Contributor Author

conorsch commented Oct 6, 2020

Debs for 1.6.0~rc2 are visible on apt-test: https://apt-test.freedom.press/pool/main/s/securedrop-app-code/ Mentioning because apt-test is currently tracking this feature branch, which has been rebased to include #66

Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

Confirmed via apt-cache in a VM. LGTM

@zenmonkeykstop zenmonkeykstop merged commit 8ac5df4 into main Oct 6, 2020
@conorsch conorsch deleted the template-consolidation branch August 30, 2021 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants