Merge pull request #3955 from freedomofpress/remove-microcode

Revert "Add intel-microcode package"
freedomofpress · Dec 3, 2018 · 618c741 · 618c741
2 parents 9b4924c + 50f534a
commit 618c741
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop
@@ -54,4 +54,4 @@ securedrop_cond_reboot_file: /tmp/sd-reboot-now
 # If you bump this, also remember to bump in molecule/builder/tests/vars.yml
 securedrop_pkg_grsec:
   ver: "4.4.162"
-  depends: "intel-microcode,linux-image-4.4.144-grsec,linux-firmware-image-4.4.144-grsec,linux-image-4.4.162-grsec,linux-firmware-image-4.4.162-grsec"
+  depends: "linux-image-4.4.144-grsec,linux-firmware-image-4.4.144-grsec,linux-image-4.4.162-grsec,linux-firmware-image-4.4.162-grsec"
diff --git a/molecule/testinfra/staging/common/test_grsecurity.py b/molecule/testinfra/staging/common/test_grsecurity.py
@@ -19,7 +19,6 @@ def test_ssh_motd_disabled(File):
 @pytest.mark.skipif(os.environ.get('FPF_GRSEC', 'true') == "false",
                     reason="Need to skip in environment w/o grsec")
 @pytest.mark.parametrize("package", [
-    'intel-microcode',
     'linux-firmware-image-{}-grsec'.format(KERNEL_VERSION),
     'linux-image-{}-grsec'.format(KERNEL_VERSION),
     'paxctl',