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

Jump to bottom

[Windows Container] Add #337 #338 AMI and add new customDeviceMapping config with new benchmark agent #339

Merged
merged 3 commits into from
Aug 29, 2023
Merged

[Windows Container] Add #337 #338 AMI and add new customDeviceMapping config with new benchmark agent #339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
582f029
Add #337 #338 AMI and add new customDeviceMapping config with new ben…
peterzhuamazon Aug 25, 2023
1398a89
More tweaks
peterzhuamazon Aug 25, 2023
2ab21b3
Remove DOCKER_HOST from the agent lable and name
peterzhuamazon Aug 29, 2023
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
1 change: 1 addition & 0 deletions lib/ci-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ export class CIStack extends Stack {
agentNode.AL2_ARM64_DOCKER_HOST,
agentNode.AL2023_ARM64_DOCKER_HOST,
agentNode.AL2023_X64_DOCKER_HOST_BENCHMARK_TEST,
agentNode.AL2023_X64_DOCKER_HOST_BENCHMARK_TEST_NEW_SPEC,
Copy link
Collaborator

@rishabh6788 rishabh6788 Aug 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a good opportunity to remove "DOCKER" from the agent label as we run everything on the localhost and not inside a CI docker container. @peterzhuamazon

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will change, thanks!

agentNode.UBUNTU2004_X64_GRADLE_CHECK,
agentNode.UBUNTU2004_X64_DOCKER_BUILDER,
agentNode.MACOS12_X64_MULTI_HOST,
Expand Down
7 changes: 4 additions & 3 deletions lib/compute/agent-node-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export interface AgentNodeProps {
agentType: string;
amiId: string;
instanceType: string;
customDeviceMapping: string;
workerLabelString: string;
remoteUser: string;
maxTotalUses: number;
Expand Down Expand Up @@ -162,7 +163,7 @@ export class AgentNodeConfig {
associatePublicIp: false,
connectBySSHProcess: false,
connectionStrategy: 'PRIVATE_IP',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
customDeviceMapping: config.customDeviceMapping,
deleteRootOnTermination: true,
description: `jenkinsAgentNode-${config.workerLabelString}`,
ebsEncryptRootVolume: 'ENCRYPTED',
Expand Down Expand Up @@ -246,7 +247,7 @@ export class AgentNodeConfig {
associatePublicIp: false,
connectBySSHProcess: false,
connectionStrategy: 'PRIVATE_IP',
customDeviceMapping: '/dev/sda1=:300:true:gp3::encrypted',
customDeviceMapping: config.customDeviceMapping,
deleteRootOnTermination: true,
description: `jenkinsAgentNode-${config.workerLabelString}`,
ebsEncryptRootVolume: 'ENCRYPTED',
Expand Down Expand Up @@ -311,7 +312,7 @@ export class AgentNodeConfig {
associatePublicIp: false,
connectBySSHProcess: false,
connectionStrategy: 'PRIVATE_IP',
customDeviceMapping: '/dev/sda1=:600:true:::encrypted',
customDeviceMapping: config.customDeviceMapping,
deleteRootOnTermination: true,
description: `jenkinsAgentNode-${config.workerLabelString}`,
ebsEncryptRootVolume: 'ENCRYPTED',
Expand Down
38 changes: 35 additions & 3 deletions lib/compute/agent-nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export class AgentNodes {

readonly AL2023_X64_DOCKER_HOST_BENCHMARK_TEST: AgentNodeProps;

readonly AL2023_X64_DOCKER_HOST_BENCHMARK_TEST_NEW_SPEC: AgentNodeProps;

readonly UBUNTU2004_X64_GRADLE_CHECK: AgentNodeProps;

readonly UBUNTU2004_X64_DOCKER_BUILDER: AgentNodeProps;
Expand All @@ -47,6 +49,7 @@ export class AgentNodes {
constructor(stack: Stack) {
this.AL2023_X64 = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2023-X64-C54xlarge-Single-Host',
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
Expand All @@ -60,6 +63,7 @@ export class AgentNodes {
};
this.AL2_X64_DOCKER_HOST = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host',
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
Expand All @@ -73,6 +77,7 @@ export class AgentNodes {
};
this.AL2023_X64_DOCKER_HOST = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host',
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
Expand All @@ -86,6 +91,7 @@ export class AgentNodes {
};
this.AL2023_ARM64 = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Single-Host',
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
Expand All @@ -99,6 +105,7 @@ export class AgentNodes {
};
this.AL2_ARM64_DOCKER_HOST = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2-Arm64-C6g4xlarge-Docker-Host',
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
Expand All @@ -112,6 +119,7 @@ export class AgentNodes {
};
this.AL2023_ARM64_DOCKER_HOST = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host',
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
Expand All @@ -125,6 +133,7 @@ export class AgentNodes {
};
this.AL2023_X64_DOCKER_HOST_BENCHMARK_TEST = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2023-X64-M52xlarge-Docker-Host-Benchmark-Test',
instanceType: 'M52xlarge',
remoteUser: 'ec2-user',
Expand All @@ -136,8 +145,23 @@ export class AgentNodes {
+ ' sudo dnf update --skip-broken --exclude=openssh* --exclude=docker* --exclude=gh* --exclude=python* -y && docker ps',
remoteFs: '/var/jenkins',
};
this.AL2023_X64_DOCKER_HOST_BENCHMARK_TEST_NEW_SPEC = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:600:true:::encrypted',
workerLabelString: 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host-Benchmark-Test-New-Spec',
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 4,
amiId: 'ami-01dfbac890366ceda',
initScript: 'sudo dnf clean all && sudo rm -rf /var/cache/dnf && sudo dnf repolist &&'
+ ' sudo dnf update --skip-broken --exclude=openssh* --exclude=docker* --exclude=gh* --exclude=python* -y && docker ps',
remoteFs: '/var/jenkins',
};
this.UBUNTU2004_X64_GRADLE_CHECK = {
agentType: 'unix',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Ubuntu2004-X64-M58xlarge-Single-Host',
instanceType: 'M58xlarge',
remoteUser: 'ubuntu',
Expand All @@ -151,6 +175,7 @@ export class AgentNodes {
};
this.UBUNTU2004_X64_DOCKER_BUILDER = {
agentType: 'unix',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Ubuntu2004-X64-M52xlarge-Docker-Builder',
instanceType: 'M52xlarge',
remoteUser: 'ubuntu',
Expand All @@ -164,6 +189,7 @@ export class AgentNodes {
};
this.MACOS12_X64_MULTI_HOST = {
agentType: 'mac',
customDeviceMapping: '/dev/sda1=:300:true:gp3::encrypted',
workerLabelString: 'Jenkins-Agent-MacOS12-X64-Mac1Metal-Multi-Host',
instanceType: 'Mac1Metal',
remoteUser: 'ec2-user',
Expand All @@ -176,6 +202,7 @@ export class AgentNodes {
};
this.WINDOWS2019_X64 = {
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-C54xlarge-Single-Host',
instanceType: 'C54xlarge',
remoteUser: 'Administrator',
Expand All @@ -188,30 +215,33 @@ export class AgentNodes {
};
this.WINDOWS2019_X64_DOCKER_HOST = {
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:600:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host',
instanceType: 'C54xlarge',
remoteUser: 'Administrator',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 2,
numExecutors: 4,
amiId: 'ami-03f326f81e2b16ae3',
amiId: 'ami-043fc8c0db1626fd2',
initScript: 'echo %USERNAME% && dockerd --register-service && net start docker && echo started docker deamon && docker ps',
remoteFs: 'C:/Users/Administrator/jenkins',
};
this.WINDOWS2019_X64_DOCKER_BUILDER = {
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Builder',
instanceType: 'C54xlarge',
remoteUser: 'Administrator',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 0,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-03f326f81e2b16ae3',
amiId: 'ami-043fc8c0db1626fd2',
initScript: 'echo %USERNAME% && dockerd --register-service && net start docker && echo started docker deamon && docker ps',
remoteFs: 'C:/Users/Administrator/jenkins',
};
this.WINDOWS2019_X64_GRADLE_CHECK = {
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host',
instanceType: 'C524xlarge',
remoteUser: 'Administrator',
Expand All @@ -224,6 +254,7 @@ export class AgentNodes {
};
this.AL2_X64_DEFAULT_AGENT = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Default-Agent-X64-C5xlarge-Single-Host',
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
Expand All @@ -241,6 +272,7 @@ export class AgentNodes {
};
this.AL2_ARM64_DEFAULT_AGENT = {
agentType: 'unix',
customDeviceMapping: '/dev/xvda=:300:true:::encrypted',
workerLabelString: 'Jenkins-Default-Agent-ARM64-C5xlarge-Single-Host',
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
Expand Down
Loading