Skip to content

Commit

Permalink
Migrate perf test agent setups to public jenkins (#153)
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
  • Loading branch information
peterzhuamazon authored Jul 8, 2022
1 parent fa6b439 commit f212fd3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/ci-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 11 additions & 0 deletions lib/compute/agent-nodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit f212fd3

Please sign in to comment.