4 files changed, 8 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh
index 7b2308739..a13050569 100644
--- a/contrib/cirrus/packer/centos_setup.sh
+++ b/contrib/cirrus/packer/centos_setup.sh
@@ -29,6 +29,7 @@ ooe.sh sudo yum -y install \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
+    emacs-nox \
     findutils \
     glib2-devel \
     glibc-static \
@@ -63,6 +64,7 @@ ooe.sh sudo yum -y install \
     runc \
     skopeo-containers \
     unzip \
+    vim \
     which \
     xz
 
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 4e4391e59..e93c45859 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -30,6 +30,7 @@ ooe.sh sudo dnf install -y \
     bzip2 \
     conmon \
     device-mapper-devel \
+    emacs-nox \
     findutils \
     git \
     glib2-devel \
@@ -67,6 +68,7 @@ ooe.sh sudo dnf install -y \
     skopeo-containers \
     slirp4netns \
     unzip \
+    vim \
     which \
     xz
 
diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
index 7f0d4e589..99376fd65 100644
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ b/contrib/cirrus/packer/rhel_setup.sh
@@ -35,6 +35,7 @@ ooe.sh sudo yum -y install \
     btrfs-progs-devel \
     bzip2 \
     device-mapper-devel \
+    emacs-nox \
     findutils \
     glib2-devel \
     glibc-static \
@@ -69,6 +70,7 @@ ooe.sh sudo yum -y install \
     runc \
     skopeo-containers \
     unzip \
+    vim \
     which \
     xz
 
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 6e3613462..af5671c90 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -37,6 +37,7 @@ ooe.sh sudo -E apt-get -qq install --no-install-recommends \
     build-essential \
     curl \
     e2fslibs-dev \
+    emacs-nox \
     gawk \
     gettext \
     go-md2man \
@@ -76,6 +77,7 @@ ooe.sh sudo -E apt-get -qq install --no-install-recommends \
     python3-setuptools \
     socat \
     unzip \
+    vim \
     xz-utils
 
 echo "Fixing Ubuntu kernel not enabling swap accounting by default"