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

Fetches tor packages for Focal #5482

Merged
merged 1 commit into from
Sep 4, 2020
Merged

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Sep 4, 2020

Status

Ready for review

Description of Changes

Updates the fetch-tor-packages to pull tor packages for both Xenial &
Focal, so we can begin hosting the latter, possible since
freedomofpress/securedrop-apt-test#57

Closes #5428

Testing

  1. On the develop branch, run make fetch-tor-packages and note the checksums for build/xenial/tor*.
    2.. On this branch, run make fetch-tor-packages and confirm no errors.
  2. Inspect the two (2) tor debs inside build/xenial/. Confirm their checksums match those from step 1.
  3. Inspect the two (2) tor debs inside build/focal/. Confirm they match byte-for-byte what's found in https://deb.torproject.org/torproject.org/pool/main/t/tor/

Once you've approved these changes, please take a gander at freedomofpress/securedrop-apt-test#60, which includes the focal packages fetched via this logic.

Deployment

Checklist

If you made changes to the server application code:

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

If you added or updated a code dependency:

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review

Updates the `fetch-tor-packages` to pull tor packages for both Xenial &
Focal, so we can begin hosting the latter, possible since
freedomofpress/securedrop-apt-test#57

Closes #5481.
conorsch pushed a commit to freedomofpress/securedrop-apt-test that referenced this pull request Sep 4, 2020
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

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

The sha256sums are matching as mentioned in the test plan.

# Use same container image as the Xenial build scenario
image: "quay.io/freedomofpress/sd-docker-builder-xenial@sha256:{{ image_hash }}"
# Use same container image as the build scenario
image: "{{ item.image }}@sha256:{{ lookup('pipe', 'egrep -v ^# ../builder-'+item.distro+'/image_hash') }}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Magic 🥇

@kushaldas kushaldas merged commit bd67e78 into develop Sep 4, 2020
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.

2 participants