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

Prod vms on focal #5669

Merged
merged 3 commits into from
Dec 17, 2020
Merged

Prod vms on focal #5669

merged 3 commits into from
Dec 17, 2020

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Dec 15, 2020

Status

Ready for review

Description of Changes

Fixes #5668 .

Adds functionality to do a Focal production install using local deb packages and the focal dist on apt-test.freedom.press.

Testing

  • on dev box:

    • check out this branch
    • add the bento/ubuntu-20.04 Vagrant box if not already present
    • set up prod focal base vms with USE_FOCAL=true vagrant up --no-provision /prod/
    • build focal debs with make build-debs-focal
    • set up local apt repo with vagrant up apt-local
  • in admin workstation:

    • proceed with prod provisioning as normal as far as ./securedrop-admin sdconfig
    • follow instructions in install_files/ansible-base/securedrop-apt-local.yml to add local repo on VMs
    • update install-fpf-repo defaults to point to apt-test+test key
    • do ./securedrop-admin install
  • installation completes successfully on Focal prod VMs

  • apt-cache policy securedrop-app-code lists the local apt server as the source

  • Source and Journalist Interface are accessible and version matches local deb version.

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing production instances.
  2. New installs.

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

Choose one of the following:

  • I have opened a PR in the docs repo for these changes, or will do so later
  • I would appreciate help with the documentation
  • These changes do not require documentation

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

@kushaldas
Copy link
Contributor

Tested with the following steps:

  • on dev box:

    • check out this branch
    • add the bento/ubuntu-20.04 Vagrant box if not already present
    • set up prod focal base vms with USE_FOCAL=1 vagrant up --no-provision /prod/
    • build focal debs with make build-debs-focal
    • set up local apt repo with vagrant up apt-local
  • in admin workstation:

    • proceed with prod provisioning as normal as far as ./securedrop-admin sdconfig
    • follow instructions in install_files/ansible-base/securedrop-apt-local.yml to add local repo on VMs
    • update install-fpf-repo defaults to point to apt-test+test key
    • do ./securedrop-admin install
  • installation completes successfully on Focal prod VMs

  • apt-cache policy securedrop-app-code lists the local apt server as the source

  • Source and Journalist Interface are accessible and version matches local deb version.

If I use USE_FOCAL=true in my debian box, it was still picking up Xenial, using USE_FOCAL=1 solved it for me.

@kushaldas
Copy link
Contributor

@zenmonkeykstop I think after #5670 is merged, you will have to rebase, and then with a CI green, we are good to merge.

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.

Tested with the following steps:

  • on dev box:

    • check out this branch
    • add the bento/ubuntu-20.04 Vagrant box if not already present
    • set up prod focal base vms with USE_FOCAL=1 vagrant up --no-provision /prod/
    • build focal debs with make build-debs-focal
    • set up local apt repo with vagrant up apt-local
  • in admin workstation:

    • proceed with prod provisioning as normal as far as ./securedrop-admin sdconfig
    • follow instructions in install_files/ansible-base/securedrop-apt-local.yml to add local repo on VMs
    • update install-fpf-repo defaults to point to apt-test+test key
    • do ./securedrop-admin install
  • installation completes successfully on Focal prod VMs

  • apt-cache policy securedrop-app-code lists the local apt server as the source

  • Source and Journalist Interface are accessible and version matches local deb version.

I will wait till standup before merging. Approved.

@kushaldas kushaldas merged commit b61a18e into develop Dec 17, 2020
@zenmonkeykstop zenmonkeykstop deleted the prod_vms_on_focal branch July 21, 2021 23:47
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.

Allow for Focal prod VM installs using local packages
2 participants