Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MacOS Arm64 Agents Setup and AMI IDs #478

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Add MacOS Arm64 Agents Setup and AMI IDs #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed215b6
Add MacOS Arm64 Agents Setup and AMI IDs
peterzhuamazon Jul 17, 2024
5d3fd72
Merge remote-tracking branch 'upstream/main' into add-macos-arm64-agents
peterzhuamazon Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/ci-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ export class CIStack extends Stack {
agentNode.AL2023_X64_BENCHMARK_TEST,
agentNode.UBUNTU2004_X64_GRADLE_CHECK,
agentNode.UBUNTU2004_X64_DOCKER_BUILDER,
agentNode.MACOS12_X64_MULTI_HOST,
agentNode.MACOS13_X64_MULTI_HOST,
agentNode.MACOS13_ARM64_MULTI_HOST,
agentNode.WINDOWS2019_X64_DOCKER_HOST,
agentNode.WINDOWS2019_X64_DOCKER_BUILDER,
agentNode.WINDOWS2019_X64_GRADLE_CHECK,
Expand Down
25 changes: 20 additions & 5 deletions lib/compute/agent-nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ export class AgentNodes {

readonly UBUNTU2004_X64_DOCKER_BUILDER: AgentNodeProps;

readonly MACOS12_X64_MULTI_HOST: AgentNodeProps;
readonly MACOS13_X64_MULTI_HOST: AgentNodeProps;

readonly MACOS13_ARM64_MULTI_HOST: AgentNodeProps;

readonly WINDOWS2019_X64_DOCKER_HOST: AgentNodeProps;

Expand Down Expand Up @@ -201,16 +203,29 @@ export class AgentNodes {
+ ' sudo apt-get update -y && (sudo killall -9 apt-get apt 2>&1 || echo) && sudo env "DEBIAN_FRONTEND=noninteractive" apt-get upgrade -y',
remoteFs: '/var/jenkins',
};
this.MACOS12_X64_MULTI_HOST = {
this.MACOS13_X64_MULTI_HOST = {
agentType: 'mac',
customDeviceMapping: '/dev/sda1=:300:true:gp3::encrypted',
workerLabelString: 'Jenkins-Agent-MacOS12-X64-Mac1Metal-Multi-Host',
workerLabelString: 'Jenkins-Agent-MacOS13-X64-Mac1Metal-Multi-Host',
instanceType: 'Mac1Metal',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 6,
amiId: 'ami-011470caf4b068ba5',
numExecutors: 4,
amiId: 'ami-05a9221f96f21bfb6',
initScript: 'echo',
remoteFs: '/var/jenkins',
};
this.MACOS13_ARM64_MULTI_HOST = {
agentType: 'mac',
customDeviceMapping: '/dev/sda1=:300:true:gp3::encrypted',
workerLabelString: 'Jenkins-Agent-MacOS13-ARM64-Mac2M2proMetal-Multi-Host1',
instanceType: 'Mac2M2proMetal',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 4,
amiId: 'ami-0931ef2039744bef9',
initScript: 'echo',
remoteFs: '/var/jenkins',
};
Expand Down
2 changes: 1 addition & 1 deletion packer/jenkins-agent-macos13-arm64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"variables": {
"ami_name": "Jenkins-Agent-MacOS13-ARM64-Mac2M2ProMetal",
"ami_name": "Jenkins-Agent-MacOS13-ARM64-Mac2M2proMetal",
"os_version": "13.6.7",
"os_architecture": "arm64_mac",
"build-region": "us-east-1",
Expand Down
Loading