diff -r 136c2536d83f -r 3aa227feffbe contrib/automation/hgautomation/aws.py --- a/contrib/automation/hgautomation/aws.py Sun Sep 29 10:19:02 2019 -0700 +++ b/contrib/automation/hgautomation/aws.py Sun Sep 29 10:21:18 2019 -0700 @@ -831,13 +831,6 @@ 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20190403', ) ssh_username = 'ubuntu' - elif distro == 'ubuntu18.10': - image = find_image( - ec2resource, - UBUNTU_ACCOUNT_ID, - 'ubuntu/images/hvm-ssd/ubuntu-cosmic-18.10-amd64-server-20190402', - ) - ssh_username = 'ubuntu' elif distro == 'ubuntu19.04': image = find_image( ec2resource,