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.

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

Remove old Windows runner and replace Windows Gradle Check Runner AMI ID with M58xlarge #355

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion lib/ci-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ export class CIStack extends Stack {
agentNode.UBUNTU2004_X64_GRADLE_CHECK,
agentNode.UBUNTU2004_X64_DOCKER_BUILDER,
agentNode.MACOS12_X64_MULTI_HOST,
agentNode.WINDOWS2019_X64,
agentNode.WINDOWS2019_X64_DOCKER_HOST,
agentNode.WINDOWS2019_X64_DOCKER_BUILDER,
agentNode.WINDOWS2019_X64_GRADLE_CHECK,
Expand Down
21 changes: 3 additions & 18 deletions lib/compute/agent-nodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ export class AgentNodes {

readonly MACOS12_X64_MULTI_HOST: AgentNodeProps;

readonly WINDOWS2019_X64: AgentNodeProps;

readonly WINDOWS2019_X64_DOCKER_HOST: AgentNodeProps;

readonly WINDOWS2019_X64_DOCKER_BUILDER: AgentNodeProps;
Expand Down Expand Up @@ -184,19 +182,6 @@ export class AgentNodes {
initScript: 'echo',
remoteFs: '/var/jenkins',
};
this.WINDOWS2019_X64 = {
peterzhuamazon marked this conversation as resolved.
Show resolved Hide resolved
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-C54xlarge-Single-Host',
instanceType: 'C54xlarge',
remoteUser: 'Administrator',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-03b2c75c26036be68',
initScript: 'echo',
remoteFs: 'C:/Users/Administrator/jenkins',
};
this.WINDOWS2019_X64_DOCKER_HOST = {
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:600:true:::encrypted',
Expand Down Expand Up @@ -234,13 +219,13 @@ export class AgentNodes {
this.WINDOWS2019_X64_GRADLE_CHECK = {
agentType: 'windows',
customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host',
instanceType: 'C524xlarge',
workerLabelString: 'Jenkins-Agent-Windows2019-X64-M58xlarge-Single-Host',
instanceType: 'M58xlarge',
peterzhuamazon marked this conversation as resolved.
Show resolved Hide resolved
remoteUser: 'Administrator',
maxTotalUses: 1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-040572cc564dd011c',
amiId: 'ami-0a00aabd70b0757f9',
initScript: 'echo',
remoteFs: 'C:/Users/Administrator/jenkins',
};
Expand Down
Loading