Let's try it for real

.buildkite/hooks/pre-command

@@ -105,3 +105,17 @@ EOF
 <summary>Agent information from gobld</summary>
 EOF
 fi
+
+# Amazon Linux 2 has DNS resolution issues with resource-based hostnames in EC2
+# We have many functional tests that try to lookup and resolve the hostname of the local machine in a particular way
+# And they fail. This sets up dnsmasq locally and sets up a manual entry for the hostname.
+if [[ -f /etc/os-release ]] && grep -q '"Amazon Linux 2"' /etc/os-release; then
+  sudo yum install -y dnsmasq bind-utils
+  echo 'addn-hosts=/etc/dnsmasq.hosts' | sudo tee -a /etc/dnsmasq.conf
+  echo "$(hostname -i | cut -d' ' -f 2)  $(hostname -f)." | sudo tee /etc/dnsmasq.hosts
+  sudo bash -c "echo 'nameserver 169.254.169.253' > /etc/resolv.dnsmasq"
+  sudo systemctl restart dnsmasq.service
+
+  sudo bash -c "echo 'supersede domain-name-servers 127.0.0.1, 169.254.169.253;' >> /etc/dhcp/dhclient.conf"
+  sudo dhclient
+fi