Add MacOS Arm64 Agents Setup and AMI IDs (#478)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Jul 17, 2024 · 612c430 · 612c430
1 parent 4aa5607
commit 612c430
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/lib/ci-stack.ts b/lib/ci-stack.ts
@@ -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,

diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts
@@ -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;
 
@@ -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',
     };

diff --git a/packer/jenkins-agent-macos13-arm64.json b/packer/jenkins-agent-macos13-arm64.json
@@ -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",