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

Fix release branch specific CI issues #3785

Merged
merged 1 commit into from
Sep 5, 2018

Conversation

redshiftzero
Copy link
Contributor

Status

Ready for review

Description of Changes

Fixes #3768. This should be backported into release/0.9 after this is merged such that we have green CI for the release tomorrow.

Changes proposed in this pull request:

  • Remove now no longer necessary task removing duplicate apt repo resolved in Removes duplicate tor-apt repo from apt config #3189
  • Remove customizations for the tor-apt test repo that we are not using (instead we're using apt-test.freedom.press which we are already using in staging environment)

Testing

Confirm this build testing this logic is passing: https://circleci.com/gh/freedomofpress/securedrop/17551

Check tor version artifact to make sure the upcoming Tor version (0.3.3.9, see #3625) to be sent to instances is installed: https://17551-3156820-gh.circle-artifacts.com/0/root/sd/.tor_version

Deployment

CI only

Checklist

If you made changes to the system configuration:

This removes now unnecessary customizations only on release branches.
We no longer should remove the tor_apt_freedom_press.list as of #3189
that is the primary Tor apt repo.

We now add test Tor packages to apt-test.freedom.press, so they will
be automatically installed provided they are more recent versions that
what is live on tor-apt.freedom.press (which is the case for pre-release
QA of Tor packages).
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

LGTM!

@conorsch conorsch merged commit 37010e6 into develop Sep 5, 2018
@heartsucker heartsucker deleted the fix-release-branch-tor-logic branch February 27, 2019 10:46
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.

test_tor_mirror_repo_declared_only_once failing on release/0.9
2 participants