This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12131

automation: use m6i instances
ClosedPublic

Authored by indygreg on Feb 2 2022, 10:11 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGae28d37f5969: automation: use m6i instances
Summary

This instance type is much, much faster than t3 and can perform
tasks much quicker.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 2 2022, 10:11 PM
Alphare added a subscriber: Alphare.Feb 3 2022, 3:45 AM

Should these go to stable? That way the 6.0.3 release can benefit from these changes.

Alphare added a comment.Feb 16 2022, 5:27 AM

I'll go with yes

Alphare accepted this revision.Feb 16 2022, 5:27 AM
This revision is now accepted and ready to land.Feb 16 2022, 5:27 AM
indygreg added a commit: rHGae28d37f5969: automation: use m6i instances.Feb 16 2022, 5:31 AM
Closed by commit rHGae28d37f5969: automation: use m6i instances (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32251

contrib/automation/hgautomation/aws.py

'DeleteOnTermination': True, 'DeleteOnTermination': True,
'VolumeSize': 32, 'VolumeSize': 32,
'VolumeType': 'gp2', 'VolumeType': 'gp2',
}, },
} }
], ],
'ImageId': image.id, 'ImageId': image.id,
'InstanceInitiatedShutdownBehavior': 'stop', 'InstanceInitiatedShutdownBehavior': 'stop',
'InstanceType': 't3.medium', 'InstanceType': 'm6i.large',
'KeyName': '%sautomation' % prefix, 'KeyName': '%sautomation' % prefix,
'MaxCount': 1, 'MaxCount': 1,
'MinCount': 1, 'MinCount': 1,
'SecurityGroupIds': [c.security_groups['windows-dev-1'].id], 'SecurityGroupIds': [c.security_groups['windows-dev-1'].id],
} }
commands = [ commands = [
# Need to start the service so sshd_config is generated. # Need to start the service so sshd_config is generated.

contrib/automation/hgautomation/cli.py

def build_all_windows_packages( def build_all_windows_packages(
hga: HGAutomation, aws_region, revision, version, base_image_name hga: HGAutomation, aws_region, revision, version, base_image_name
): ):
c = hga.aws_connection(aws_region) c = hga.aws_connection(aws_region)
image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name) image = aws.ensure_windows_dev_ami(c, base_image_name=base_image_name)
DIST_PATH.mkdir(exist_ok=True) DIST_PATH.mkdir(exist_ok=True)
with aws.temporary_windows_dev_instances(c, image, 't3.medium') as insts: with aws.temporary_windows_dev_instances(c, image, 'm6i.large') as insts:
instance = insts[0] instance = insts[0]
winrm_client = instance.winrm_client winrm_client = instance.winrm_client
windows.synchronize_hg(SOURCE_ROOT, revision, instance) windows.synchronize_hg(SOURCE_ROOT, revision, instance)
for py_version in ("2.7", "3.7", "3.8", "3.9"): for py_version in ("2.7", "3.7", "3.8", "3.9"):
for arch in ("x86", "x64"): for arch in ("x86", "x64"):
sp = subparsers.add_parser( sp = subparsers.add_parser(
'run-tests-windows', 'run-tests-windows',
help='Run tests on Windows', help='Run tests on Windows',
) )
sp.add_argument( sp.add_argument(
'--instance-type', '--instance-type',
help='EC2 instance type to use', help='EC2 instance type to use',
default='t3.medium', default='m6i.large',
) )
sp.add_argument( sp.add_argument(
'--python-version', '--python-version',
help='Python version to use', help='Python version to use',
choices={'2.7', '3.5', '3.6', '3.7', '3.8', '3.9'}, choices={'2.7', '3.5', '3.6', '3.7', '3.8', '3.9'},
default='2.7', default='2.7',
) )
sp.add_argument( sp.add_argument(