Rebuilds 1.8.0 Xenial boxes

We've had some trouble running the 1.8.0 upgrade boxes. This rebuilds them, using the latest available bento/16.04 version (202103.19.0), as well as a small tweak to the prep logic to provide a depedency that was recently removed from the Bento sources.
freedomofpress · Mar 30, 2021 · 2d81308 · 2d81308
1 parent 64d945e
commit 2d81308
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/molecule/vagrant-packager/box_files/app_xenial_metadata.json b/molecule/vagrant-packager/box_files/app_xenial_metadata.json
@@ -192,7 +192,18 @@
     {
       "providers": [
         {
-          "checksum": "6d9ebdb45d5ffd180fa4c3a673e05058fc6c73e789d742dec80eb90242302077",
+          "checksum": "b0c2908dfdf7f705ee1c38949744b04008b4654a201b6ca319eb07fcc688fba8",
+          "checksum_type": "sha256",
+          "name": "libvirt",
+          "url": "https://dev-bin.ops.securedrop.org/vagrant/app-staging-xenial_1.8.0.box"
+        }
+      ],
+      "version": "1.8.0"
+    },
+    {
+      "providers": [
+        {
+          "checksum": "f05ec782c52714a66af8fe70e109e325c2674db590243e4555964c9adc9e6f3d",
           "checksum_type": "sha256",
           "name": "libvirt",
           "url": "https://dev-bin.ops.securedrop.org/vagrant/app-staging-xenial_1.8.0.box"

diff --git a/molecule/vagrant-packager/box_files/mon_xenial_metadata.json b/molecule/vagrant-packager/box_files/mon_xenial_metadata.json
@@ -192,7 +192,18 @@
     {
       "providers": [
         {
-          "checksum": "6fa75c742113f7c121cbe225edd50b6ce2032e20168a72a76ed24217a3cf446a",
+          "checksum": "ec8296ef496ceac6fd72c8cd570cd6b5f513683849b0e55250565e55f58130e5",
+          "checksum_type": "sha256",
+          "name": "libvirt",
+          "url": "https://dev-bin.ops.securedrop.org/vagrant/mon-staging-xenial_1.8.0.box"
+        }
+      ],
+      "version": "1.8.0"
+    },
+    {
+      "providers": [
+        {
+          "checksum": "317114e1927ee09f0da788dc4cf310beb38404ab8ee237cfc9ca4222a16e0c9e",
           "checksum_type": "sha256",
           "name": "libvirt",
           "url": "https://dev-bin.ops.securedrop.org/vagrant/mon-staging-xenial_1.8.0.box"

diff --git a/molecule/vagrant-packager/prepare.yml b/molecule/vagrant-packager/prepare.yml
@@ -7,3 +7,12 @@
       raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal)
       become: True
       changed_when: False
+
+    # More recent Bento boxes dropped this dependency, but our packages assume it's present,
+    # since it is on a default ISO install of Ubuntu Server.
+    - name: Install release-updater-core pkg
+      apt:
+        name: ubuntu-release-updater-core
+        state: present
+        update_cache: yes
+        cache_valid_time: 3600