From f212fd300d21167774013a8837a075431ecf821f Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 8 Jul 2022 16:13:29 -0400 Subject: [PATCH] Migrate perf test agent setups to public jenkins (#153) Signed-off-by: Peter Zhu --- lib/ci-stack.ts | 4 ++-- lib/compute/agent-nodes.ts | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/ci-stack.ts b/lib/ci-stack.ts index 99d6e71c..bd3ded41 100644 --- a/lib/ci-stack.ts +++ b/lib/ci-stack.ts @@ -101,8 +101,8 @@ export class CIStack extends Stack { const importedReloadPasswordSecretsArn = Fn.importValue(`${CIConfigStack.CASC_RELOAD_TOKEN_SECRET_EXPORT_VALUE}`); const listenerCertificate = ListenerCertificate.fromArn(certificateArn.secretValue.toString()); const agentNode = new AgentNodes(); - const agentNodes: AgentNodeProps[] = [agentNode.AL2_X64, agentNode.AL2_X64_DOCKER_HOST, agentNode.AL2_ARM64, agentNode.AL2_ARM64_DOCKER_HOST, - agentNode.UBUNTU_X64, agentNode.UBUNTU_X64_DOCKER_BUILDER]; + const agentNodes: AgentNodeProps[] = [agentNode.AL2_X64, agentNode.AL2_X64_DOCKER_HOST, agentNode.AL2_X64_DOCKER_HOST_PERF_TEST, + agentNode.AL2_ARM64, agentNode.AL2_ARM64_DOCKER_HOST, agentNode.UBUNTU_X64, agentNode.UBUNTU_X64_DOCKER_BUILDER]; const mainJenkinsNode = new JenkinsMainNode(this, { vpc, diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts index 9d6eee4a..ed830c94 100644 --- a/lib/compute/agent-nodes.ts +++ b/lib/compute/agent-nodes.ts @@ -17,6 +17,8 @@ export class AgentNodes { readonly AL2_X64_DOCKER_HOST: AgentNodeProps; + readonly AL2_X64_DOCKER_HOST_PERF_TEST: AgentNodeProps; + readonly AL2_ARM64: AgentNodeProps; readonly AL2_ARM64_DOCKER_HOST: AgentNodeProps; @@ -44,6 +46,15 @@ export class AgentNodes { initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&' + ' sudo yum update --skip-broken --exclude=openssh* --exclude=docker* -y', }; + this.AL2_X64_DOCKER_HOST_PERF_TEST = { + workerLabelString: 'Jenkins-Agent-al2-x64-m52xlarge-Docker-Host-Perf-Test', + instanceType: 'M52xlarge', + remoteUser: 'ec2-user', + numExecutors: 8, + amiId: 'ami-00a07e55fcad01043', + initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum/* && sudo yum repolist &&' + + ' sudo yum update --skip-broken --exclude=openssh* --exclude=docker* -y', + }; this.AL2_ARM64 = { workerLabelString: 'Jenkins-Agent-al2-arm64-c6g4xlarge-Single-Host', instanceType: 'C6g4xlarge',