diff --git a/contrib/automation/hgautomation/aws.py b/contrib/automation/hgautomation/aws.py --- a/contrib/automation/hgautomation/aws.py +++ b/contrib/automation/hgautomation/aws.py @@ -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, diff --git a/contrib/automation/hgautomation/linux.py b/contrib/automation/hgautomation/linux.py --- a/contrib/automation/hgautomation/linux.py +++ b/contrib/automation/hgautomation/linux.py @@ -22,7 +22,6 @@ DISTROS = { 'debian9', 'ubuntu18.04', - 'ubuntu18.10', 'ubuntu19.04', }