chore(UNTESTED): attempt to support focal

Author: JacobCoffee

Vagrantfile

@@ -2,6 +2,7 @@
 
 
 SERVERS = [
+  # TODO: test focal salt repo changes
   {:name => "backup-server", :codename => "noble"},
   {:name => "bugs", :codename => "jammy", :ports => [8080]},
   {:name => "buildbot", :codename => "noble"},

dockerfiles/Dockerfile.focal

@@ -0,0 +1,58 @@
+           # Docker image to use with Vagrant
+# Aims to be as similar to normal Vagrant usage as possible
+# Adds SSH daemon, Systemd
+# Adapted from https://github.com/BashtonLtd/docker-vagrant-images/blob/master/ubuntu1404/Dockerfile
+
+FROM ubuntu:20.04
+ENV container docker
+
+RUN ln -snf /usr/share/zoneinfo/UTC /etc/localtime && echo $TZ > /etc/timezone
+
+RUN apt-get update -y && apt-get dist-upgrade -y
+
+# Install system dependencies, you may not need all of these
+RUN apt-get install -y --no-install-recommends ssh sudo libffi-dev systemd openssh-client wget gnupg-utils gnupg apt-utils ca-certificates dbus locales cron dialog rsyslog iproute2 logrotate
+
+RUN locale-gen en_US.UTF-8
+COPY ./etc/locale.conf /etc/locale.conf
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+COPY ./etc/ssl/private/dhparams.pem /etc/ssl/private/dhparams.pem
+
+# Install Vim
+RUN apt-get install -y vim
+
+# Needed to run systemd
+# VOLUME [ "/sys/fs/cgroup" ]
+# Doesn't appear to be necessary? See comments
+
+# Add vagrant user and key for SSH
+RUN useradd --create-home -s /bin/bash vagrant
+RUN echo -n 'vagrant:vagrant' | chpasswd
+RUN echo 'vagrant ALL = NOPASSWD: ALL' > /etc/sudoers.d/vagrant
+RUN chmod 440 /etc/sudoers.d/vagrant
+RUN mkdir -p /home/vagrant/.ssh
+RUN chmod 700 /home/vagrant/.ssh
+RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ==" > /home/vagrant/.ssh/authorized_keys
+RUN chmod 600 /home/vagrant/.ssh/authorized_keys
+RUN chown -R vagrant:vagrant /home/vagrant/.ssh
+RUN sed -i -e 's/Defaults.*requiretty/#&/' /etc/sudoers
+RUN sed -i -e 's/\(UsePAM \)yes/\1 no/' /etc/ssh/sshd_config
+
+# Start SSH
+RUN mkdir /var/run/sshd
+EXPOSE 22
+RUN /usr/sbin/sshd
+
+# Setup Salt Common
+RUN wget --quiet -O /etc/apt/keyrings/salt-archive-keyring-2024.pgp https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
+RUN echo "deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.pgp arch=$(dpkg --print-architecture)] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main" > /etc/apt/sources.list.d/salt.list
+
+# Pin to Salt 3006 LTS
+RUN printf "Package: salt-*\nPin: version 3006.*\nPin-Priority: 1001\n" > /etc/apt/preferences.d/salt-pin-1001
+RUN apt-get update -y && apt-get install -y --no-install-recommends salt-minion
+
+# Start Systemd (systemctl)
+CMD ["/lib/systemd/systemd"]

salt/base/salt.sls

@@ -35,7 +35,7 @@ remove_old_salt_repo:
 
 salt-repo:
   pkgrepo.managed:
-    {% if grains["oscodename"] in ["jammy", "noble"] %}
+    {% if grains["oscodename"] in ["focal", "jammy", "noble"] %}
     - name: deb [signed-by=/etc/apt/keyrings/salt-archive-keyring-2024.pgp arch={{ grains["osarch"] }}] https://packages.broadcom.com/artifactory/saltproject-deb/ stable main
     - key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public
     - aptkey: False