diff --git a/docs/development/upgrade_testing.rst b/docs/development/upgrade_testing.rst index 61bfb39b44..48dda6dd57 100644 --- a/docs/development/upgrade_testing.rst +++ b/docs/development/upgrade_testing.rst @@ -123,10 +123,11 @@ When a new version of SecureDrop is released, we must create and upload new VM images, to enable testing against that base version in future upgrade testing. The procedure is as follows: -1. ``git checkout `` -2. ``make vagrant-package`` -3. ``cd molecule/vagrant-packager && ./push.yml`` to upload to S3 -4. Commit the local changes to JSON files and open a PR. +1. ``make clean`` to remove any previous artifacts (which would also be pushed) +2. ``git checkout `` (if a point release, ``git checkout develop``) +3. ``make vagrant-package`` +4. ``cd molecule/vagrant-packager && ./push.yml`` to upload to S3 +5. Commit the local changes to JSON files and open a PR. Subsequent invocations of ``make upgrade-start`` will pull the latest version of the box. diff --git a/molecule/vagrant-packager/box_files/app_xenial_metadata.json b/molecule/vagrant-packager/box_files/app_xenial_metadata.json index e7915857ab..a191e901f8 100644 --- a/molecule/vagrant-packager/box_files/app_xenial_metadata.json +++ b/molecule/vagrant-packager/box_files/app_xenial_metadata.json @@ -45,6 +45,17 @@ } ], "version": "0.13.0" + }, + { + "providers": [ + { + "checksum": "9e4e2cd973c0daa955d24597ab9ae4e0915b032fe7cd26fdd0f410d4e4300143", + "checksum_type": "sha256", + "name": "libvirt", + "url": "https://dev-bin.ops.securedrop.org/vagrant/app-staging-xenial_0.13.1.box" + } + ], + "version": "0.13.1" } ] -} \ No newline at end of file +} diff --git a/molecule/vagrant-packager/box_files/mon_xenial_metadata.json b/molecule/vagrant-packager/box_files/mon_xenial_metadata.json index 498c6a52af..77463c0406 100644 --- a/molecule/vagrant-packager/box_files/mon_xenial_metadata.json +++ b/molecule/vagrant-packager/box_files/mon_xenial_metadata.json @@ -45,6 +45,17 @@ } ], "version": "0.13.0" + }, + { + "providers": [ + { + "checksum": "cbe347281867def31e6f6383d40a072d1336bde1ead14fd886192bf548ef41f7", + "checksum_type": "sha256", + "name": "libvirt", + "url": "https://dev-bin.ops.securedrop.org/vagrant/mon-staging-xenial_0.13.1.box" + } + ], + "version": "0.13.1" } ] -} \ No newline at end of file +}