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.

Sign up for GitHub

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

Jump to bottom

[1.7.0] Backport 5718,5720 and bump to 1.7.0-rc3 #5723

Merged
merged 3 commits into from
Jan 19, 2021
Merged

[1.7.0] Backport 5718,5720 and bump to 1.7.0-rc3 #5723

merged 3 commits into from
Jan 19, 2021

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Jan 19, 2021 •
edited by sssoleileraaa
Loading

Status

Ready for review

Description of Changes

Towards #5689

Testing

If you made non-trivial code changes:

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

emkll added 3 commits January 19, 2021 15:50
@emkll
Only configure v2 ssh service when v2 services are enabled
03c6656 
(cherry picked from commit 0405015)
@emkll
Use next gen circleci python images in lieu of cloud builders
c044499 
The docker container provided by GCPs cloud-builders now recommends in its README the use of other docker containers, and is still running on Xenial. Since they are essentially swappable in place, here we use the containers that are maintained by the CI provider [2]

[1] https://github.com/GoogleCloudPlatform/cloud-builders
[2] https://circleci.com/developer/images/image/cimg/python

(cherry picked from commit 6660a1b)
@emkll
SecureDrop 1.7.0-rc3
2c0c295
@emkll emkll requested a review from sssoleileraaa January 19, 2021 23:04
@emkll emkll marked this pull request as draft January 19, 2021 23:06
@emkll emkll marked this pull request as ready for review January 19, 2021 23:18
sssoleileraaa
sssoleileraaa approved these changes Jan 19, 2021
View reviewed changes
Copy link
Contributor

@sssoleileraaa sssoleileraaa 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 and looks good

@sssoleileraaa sssoleileraaa merged commit ab4db41 into release/1.7.0 Jan 19, 2021
@sssoleileraaa sssoleileraaa deleted the backports-and-170-rc3 branch January 19, 2021 23:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sssoleileraaa sssoleileraaa sssoleileraaa approved these changes

@conorsch conorsch Awaiting requested review from conorsch

@kushaldas kushaldas Awaiting requested review from kushaldas

@redshiftzero redshiftzero Awaiting requested review from redshiftzero

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emkll @sssoleileraaa