Skip to content

Commit

Permalink
Update all packaging repo names according to securedrop-builder#304
Browse files Browse the repository at this point in the history
  • Loading branch information
Allie Crevier committed Feb 10, 2023
1 parent 15cd4c2 commit 429499f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
"https://forum.securedrop.org/admin/users/list/active",
"https://weblate.securedrop.org/projects/securedrop/securedrop/#announcement",
"https://weblate.securedrop.org/projects/securedrop/securedrop/#repository",
"https://github.com/freedomofpress/securedrop-debian-packages-lfs",
"https://github.com/freedomofpress/securedrop-apt-prod",
r"https://weblate.securedrop.org/accounts/profile/.*",
r"https://github.com/freedomofpress/securedrop/issues/.*",
r"https://github.com/freedomofpress/securedrop/tree/.*",
Expand Down
6 changes: 3 additions & 3 deletions docs/release_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ Pre-Release

c. Build logs should be saved and published according to the `build log guidelines
<https://github.com/freedomofpress/securedrop/wiki/Build-logs>`_.
d. Open a PR on `securedrop-dev-packages-lfs
<https://github.com/freedomofpress/securedrop-dev-packages-lfs>`_ that targets the ``main``
d. Open a PR on `securedrop-apt-test
<https://github.com/freedomofpress/securedrop-apt-test>`_ that targets the ``main``
branch with the new debs. Do not include tarballs or any debs that would overwrite
existing debs. Changes merged to this branch will be published to ``apt-test.freedom.press``
within 15 minutes.
Expand Down Expand Up @@ -238,7 +238,7 @@ Release Process
log guidelines
<https://github.com/freedomofpress/securedrop/wiki/Build-logs>`_.
#. In a clone of the private
`securedrop-debian-packages-lfs <https://github.com/freedomofpress/securedrop-debian-packages-lfs>`_
`securedrop-apt-prod <https://github.com/freedomofpress/securedrop-apt-prod>`_
repository, create a branch from ``main`` called ``release``.
#. In your local branch, commit the built packages to the ``core/focal``
directory.
Expand Down
6 changes: 3 additions & 3 deletions docs/updating_tor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Announcements for new Tor releases are posted in the `Tor forum
<https://forum.torproject.net/c/news/tor-release-announcement/28>`_.

Our continuous integration automatically checks for new Tor packages every
night and should commit them to the `securedrop-dev-packages-lfs
<https://github.com/freedomofpress/securedrop-dev-packages-lfs>`_ repository.
night and should commit them to the `securedrop-apt-test
<https://github.com/freedomofpress/securedrop-apt-test>`_ repository.
Within 15 minutes they should be available for download via
``apt-test.freedom.press``.

Expand All @@ -32,5 +32,5 @@ Promoting
---------

To promote a Tor release to production, copy the ``*.deb`` files over to the
`securedrop-debian-packages-lfs <https://github.com/freedomofpress/securedrop-debian-packages-lfs>`_
`securedrop-apt-prod <https://github.com/freedomofpress/securedrop-apt-prod>`_
repository and follow those instructions.
2 changes: 1 addition & 1 deletion docs/workstation_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Building workstation deb packages

Debian packages for the SecureDrop Workstation components are maintained
in a separate repository:
https://github.com/freedomofpress/securedrop-debian-packaging/
https://github.com/freedomofpress/securedrop-builder/

Building workstation rpm packages
---------------------------------
Expand Down
22 changes: 11 additions & 11 deletions docs/workstation_release_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ SecureDrop Workstation code spans across several repositories:
brought in as a dependency of ``securedrop-client``)
- https://github.com/freedomofpress/securedrop-workstation (RPM
packaged)
- `securedrop-workstation-config <https://github.com/freedomofpress/securedrop-debian-packaging/tree/main/securedrop-workstation-config>`__ (Debian packaged)
- `securedrop-workstation-viewer <https://github.com/freedomofpress/securedrop-debian-packaging/tree/main/securedrop-workstation-viewer>`__ (Debian packaged)
- `securedrop-workstation-config <https://github.com/freedomofpress/securedrop-builder/tree/main/securedrop-workstation-config>`__ (Debian packaged)
- `securedrop-workstation-viewer <https://github.com/freedomofpress/securedrop-builder/tree/main/securedrop-workstation-viewer>`__ (Debian packaged)

Each SecureDrop Workstation component can be released independently. It’s worth noting that in general ``securedrop-sdk`` releases are accompanied with a ``securedrop-client`` release, as ``securedrop-sdk`` is a Python dependency of the ``securedrop-client`` code, so any change in the SDK the client wants to use will necessitate a release of the client also.

Expand Down Expand Up @@ -63,7 +63,7 @@ Step 2: Build the package
6. Save and publish your terminal history to the [build-logs repository](https://github.com/freedomofpress/build-logs/).

7. Open a PR to https://github.com/freedomofpress/securedrop-dev-packages-lfs with the package you want to deploy. Remember to link to your build logs commit. Once your PR is merged, the package will be deployed to https://apt-test.freedom.press.
7. Open a PR to https://github.com/freedomofpress/securedrop-apt-test with the package you want to deploy. Remember to link to your build logs commit. Once your PR is merged, the package will be deployed to https://apt-test.freedom.press.

Step 3: Begin QA
----------------
Expand Down Expand Up @@ -97,7 +97,7 @@ Step 5: Build a production version of the package
Step 6: Sign the Debian Release file with the SecureDrop release key
--------------------------------------------------------------------

1. Add your package to a new branch called ``release`` in https://github.com/freedomofpress/securedrop-debian-packages-lfs.
1. Add your package to a new branch called ``release`` in https://github.com/freedomofpress/securedrop-apt-prod.
2. :ref:`Regenerate and sign the apt release file`.

Step 7: Deploy the package to ``apt-qa``
Expand Down Expand Up @@ -134,7 +134,7 @@ Release ``securedrop-workstation-dom0-config``
4. sha256sum the built template (and store hash in the build
logs/commit message).
5. Commit the (unsigned) version of this RPM to a branch in the
`securedrop-workstation-prod-rpm-packages-lfs <https://github.com/freedomofpress/securedrop-workstation-prod-rpm-packages-lfs>`__
`securedrop-yum-prod<https://github.com/freedomofpress/securedrop-yum-prod>`__
repository.
6. Copy the RPM to the signing environment.
7. Verify integrity of RPM prior to signing (use sha256sums to
Expand All @@ -152,7 +152,7 @@ Release ``securedrop-workstation-dom0-config``
of the package before and after signing is included in the build
log.
11. Commit the RPM in a second commit on the branch you began above in
`securedrop-workstation-prod-rpm-packages-lfs <https://github.com/freedomofpress/securedrop-workstation-prod-rpm-packages-lfs>`__.
`securedrop-yum-prod<https://github.com/freedomofpress/securedrop-yum-prod>`__.
Make a PR.
12. Upon merge to master, ensure that changes deploy to
``yum.securedrop.org`` without issue.
Expand All @@ -178,13 +178,13 @@ production (``yum.securedrop.org``) using the following procedure:
below).
7. Commit signed template.
8. Push those two commits to a PR in
`securedrop-workstation-dev-rpm-packages-lfs <https://github.com/freedomofpress/securedrop-workstation-dev-rpm-packages-lfs/>`__.
`securedrop-yum-test<https://github.com/freedomofpress/securedrop-yum-test/>`__.
Make the PR.
9. Upload build logs directly to the
`build-logs <https://github.com/freedomofpress/build-logs>`__
repository in the workstation directory.
10. Upon merge of the PR into
`securedrop-workstation-dev-rpm-packages-lfs <https://github.com/freedomofpress/securedrop-workstation-dev-rpm-packages-lfs/>`__,
`securedrop-yum-test<https://github.com/freedomofpress/securedrop-yum-test/>`__,
the template will be deployed to ``yum-test.securedrop.org``.
11. Install the template in dom0 and test it. Provided you’ve run the Salt configurations, find the template via:
``sudo qubes-dom0-update --action=search qubes-template-securedrop-workstation``.
Expand All @@ -193,7 +193,7 @@ production (``yum.securedrop.org``) using the following procedure:
13. Verify unsigned template sha256sum from build logs/commit message.
14. Sign template with prod key: ``rpm --resign <file>``
15. Push commit to a branch in the
`securedrop-workstation-prod-rpm-packages-lfs <https://github.com/freedomofpress/securedrop-workstation-prod-rpm-packages-lfs/>`__
`securedrop-yum-prod<https://github.com/freedomofpress/securedrop-yum-prod/>`__
repository. Make a PR.
16. Upon merge to master, ensure that changes deploy to
``yum.securedrop.org`` without issue.
Expand Down Expand Up @@ -222,8 +222,8 @@ Regenerate and sign the apt release file

.. code-block:: sh
git clone https://github.com/freedomofpress/securedrop-debian-packages-lfs
cd securedrop-debian-packages-lfs
git clone https://github.com/freedomofpress/securedrop-apt-prod
cd securedrop-apt-prod
git checkout -b release
./tools/publish`
Expand Down

0 comments on commit 429499f

Please sign in to comment.