-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support MacOS13 x64/arm64 Agents Packer Templates on EC2 (#459)
* Add initial macos13 templates for x64 and arm64 Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Tweak macos server scripts with arm64 support Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add more fixes Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * More changes to enable imdsv2 Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add missing brewpath for arm64 macOS Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Support macos arm64 java installation now Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove extra scripts Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
- Loading branch information
1 parent
4aa43e7
commit e3d777c
Showing
5 changed files
with
257 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| export PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH | ||
| export PATH=/opt/local/bin:$PATH | ||
| export PATH=/opt/homebrew/bin:/opt/local/bin:$PATH | ||
| export PATH=/Users/ec2-user/Library/Python/3.9/bin:/opt/local/Library/Frameworks/Python.framework/Versions/3.9/bin:$PATH | ||
| export PATH=/usr/local/opt/grep/libexec/gnubin:$PATH | ||
| export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| { | ||
| "variables": { | ||
| "ami_name": "Jenkins-Agent-MacOS13-ARM64-Mac2M2ProMetal", | ||
| "os_version": "13.6.7", | ||
| "os_architecture": "arm64_mac", | ||
| "build-region": "us-east-1", | ||
| "build-vpc": "vpc-<>", | ||
| "build-subnet": "subnet-<>", | ||
| "build-secgrp": "sg-<>", | ||
| "build-time": "{{isotime \"2006-01-02T03-04-05Z\"}}", | ||
| "aws_ami_region": "us-east-1", | ||
| "root_volume_size_gb": "300" | ||
| }, | ||
| "builders": [ | ||
| { | ||
| "name": "{{user `ami_name`}}-{{user `os_version`}}-{{user `build-time`}}", | ||
| "ami_description": "{{user `ami_name`}}", | ||
| "type": "amazon-ebs", | ||
| "encrypt_boot": "false", | ||
| "region": "{{user `build-region`}}", | ||
| "ami_regions": "{{user `aws_ami_region`}}", | ||
| "instance_type": "mac2-m2pro.metal", | ||
| "ami_name": "{{user `ami_name`}}-{{user `os_version`}}-{{user `build-time`}}", | ||
| "vpc_id": "{{user `build-vpc`}}", | ||
| "subnet_id": "{{user `build-subnet`}}", | ||
| "aws_polling": { | ||
| "delay_seconds": 60, | ||
| "max_attempts": 60 | ||
| }, | ||
| "security_group_ids": "{{user `build-secgrp`}}", | ||
| "ssh_interface": "", | ||
| "source_ami_filter": { | ||
| "filters": { | ||
| "virtualization-type": "hvm", | ||
| "name": "amzn-ec2-macos-{{user `os_version`}}-*", | ||
| "root-device-type": "ebs", | ||
| "architecture": "{{user `os_architecture`}}" | ||
| }, | ||
| "owners": [ | ||
| "amazon" | ||
| ], | ||
| "most_recent": true | ||
| }, | ||
| "associate_public_ip_address": false, | ||
| "metadata_options": { | ||
| "http_endpoint": "enabled", | ||
| "http_tokens": "required", | ||
| "http_put_response_hop_limit": 1 | ||
| }, | ||
| "ssh_username": "ec2-user", | ||
| "ssh_timeout": "3h", | ||
| "tenancy": "host", | ||
| "ebs_optimized": "true", | ||
| "tags": { | ||
| "Name": "{{user `ami_name`}}-{{user `os_version`}}-{{user `build-time`}}", | ||
| "OS_Version": "{{user `os_version`}}", | ||
| "User": "Packer", | ||
| "Encrypted_AMI": "False", | ||
| "Created": "{{user `build-time`}}" | ||
| }, | ||
| "launch_block_device_mappings": [ | ||
| { | ||
| "device_name": "/dev/sda1", | ||
| "volume_size": "{{user `root_volume_size_gb`}}", | ||
| "delete_on_termination": true, | ||
| "volume_type": "gp3" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "provisioners": [ | ||
| { | ||
| "type": "shell", | ||
| "inline": [ | ||
| "sudo /usr/local/bin/ec2-macos-init clean --all" | ||
| ], | ||
| "max_retries": 3 | ||
| }, | ||
| { | ||
| "type": "shell", | ||
| "inline": [ | ||
| "sudo chsh -s /bin/bash $(whoami)" | ||
| ], | ||
| "max_retries": 3 | ||
| }, | ||
| { | ||
| "type": "file", | ||
| "source": "files/macos/bash_profile", | ||
| "destination": "/Users/ec2-user/.bash_profile" | ||
| }, | ||
| { | ||
| "type": "file", | ||
| "source": "files/macos/bashrc", | ||
| "destination": "/Users/ec2-user/.bashrc" | ||
| }, | ||
| { | ||
| "type": "shell", | ||
| "scripts": [ | ||
| "scripts/macos/macos-agentsetup.sh" | ||
| ], | ||
| "max_retries": 3 | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| { | ||
| "variables": { | ||
| "ami_name": "Jenkins-Agent-MacOS13-X64-Mac1Metal-JDK21", | ||
| "os_version": "13.6.7", | ||
| "os_architecture": "x86_64_mac", | ||
| "build-region": "us-east-1", | ||
| "build-vpc": "vpc-<>", | ||
| "build-subnet": "subnet-<>", | ||
| "build-secgrp": "sg-<>", | ||
| "build-time": "{{isotime \"2006-01-02T03-04-05Z\"}}", | ||
| "aws_ami_region": "us-east-1", | ||
| "root_volume_size_gb": "300" | ||
| }, | ||
| "builders": [ | ||
| { | ||
| "name": "{{user `ami_name`}}-{{user `os_version`}}-{{user `build-time`}}", | ||
| "ami_description": "{{user `ami_name`}}", | ||
| "type": "amazon-ebs", | ||
| "encrypt_boot": "false", | ||
| "region": "{{user `build-region`}}", | ||
| "ami_regions": "{{user `aws_ami_region`}}", | ||
| "instance_type": "mac1.metal", | ||
| "ami_name": "{{user `ami_name`}}-{{user `os_version`}}-{{user `build-time`}}", | ||
| "vpc_id": "{{user `build-vpc`}}", | ||
| "subnet_id": "{{user `build-subnet`}}", | ||
| "aws_polling": { | ||
| "delay_seconds": 60, | ||
| "max_attempts": 60 | ||
| }, | ||
| "security_group_ids": "{{user `build-secgrp`}}", | ||
| "ssh_interface": "", | ||
| "source_ami_filter": { | ||
| "filters": { | ||
| "virtualization-type": "hvm", | ||
| "name": "amzn-ec2-macos-{{user `os_version`}}-*", | ||
| "root-device-type": "ebs", | ||
| "architecture": "{{user `os_architecture`}}" | ||
| }, | ||
| "owners": [ | ||
| "amazon" | ||
| ], | ||
| "most_recent": true | ||
| }, | ||
| "associate_public_ip_address": false, | ||
| "metadata_options": { | ||
| "http_endpoint": "enabled", | ||
| "http_tokens": "required", | ||
| "http_put_response_hop_limit": 1 | ||
| }, | ||
| "ssh_username": "ec2-user", | ||
| "ssh_timeout": "3h", | ||
| "tenancy": "host", | ||
| "ebs_optimized": "true", | ||
| "tags": { | ||
| "Name": "{{user `ami_name`}}-{{user `os_version`}}-{{user `build-time`}}", | ||
| "OS_Version": "{{user `os_version`}}", | ||
| "User": "Packer", | ||
| "Encrypted_AMI": "False", | ||
| "Created": "{{user `build-time`}}" | ||
| }, | ||
| "launch_block_device_mappings": [ | ||
| { | ||
| "device_name": "/dev/sda1", | ||
| "volume_size": "{{user `root_volume_size_gb`}}", | ||
| "delete_on_termination": true, | ||
| "volume_type": "gp3" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "provisioners": [ | ||
| { | ||
| "type": "shell", | ||
| "inline": [ | ||
| "sudo /usr/local/bin/ec2-macos-init clean --all" | ||
| ], | ||
| "max_retries": 3 | ||
| }, | ||
| { | ||
| "type": "shell", | ||
| "inline": [ | ||
| "sudo chsh -s /bin/bash $(whoami)" | ||
| ], | ||
| "max_retries": 3 | ||
| }, | ||
| { | ||
| "type": "file", | ||
| "source": "files/macos/bash_profile", | ||
| "destination": "/Users/ec2-user/.bash_profile" | ||
| }, | ||
| { | ||
| "type": "file", | ||
| "source": "files/macos/bashrc", | ||
| "destination": "/Users/ec2-user/.bashrc" | ||
| }, | ||
| { | ||
| "type": "shell", | ||
| "scripts": [ | ||
| "scripts/macos/macos-agentsetup.sh" | ||
| ], | ||
| "max_retries": 3 | ||
| } | ||
| ] | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters