From 6e57cb35fe5dadbb235953bcd714a90329199163 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 8 Sep 2023 15:50:33 -0400 Subject: [PATCH] Replace c54xlarge instance with c59xlarge on Jenkins Main Node (#347) Signed-off-by: Peter Zhu --- lib/compute/jenkins-main-node.ts | 2 +- resources/docker-compose.yml | 10 +++++----- test/ci-stack.test.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/compute/jenkins-main-node.ts b/lib/compute/jenkins-main-node.ts index 022f6a0..6948567 100644 --- a/lib/compute/jenkins-main-node.ts +++ b/lib/compute/jenkins-main-node.ts @@ -112,7 +112,7 @@ export class JenkinsMainNode { this.EFS_ID = efs.fileSystemId; } this.mainNodeAsg = new AutoScalingGroup(stack, 'MainNodeAsg', { - instanceType: InstanceType.of(InstanceClass.C5, InstanceSize.XLARGE4), + instanceType: InstanceType.of(InstanceClass.C5, InstanceSize.XLARGE9), machineImage: MachineImage.latestAmazonLinux({ generation: AmazonLinuxGeneration.AMAZON_LINUX_2, }), diff --git a/resources/docker-compose.yml b/resources/docker-compose.yml index 24e4615..fcfb8c1 100644 --- a/resources/docker-compose.yml +++ b/resources/docker-compose.yml @@ -11,18 +11,18 @@ services: - 50000:50000 container_name: jenkins environment: - - JENKINS_JAVA_OPTS="-Xmx18g" + - JENKINS_JAVA_OPTS="-Xmx60g -Xss4m" - CASC_RELOAD_TOKEN=reloadPasswordHere volumes: - /var/lib/jenkins:/var/jenkins_home deploy: resources: limits: - cpus: '12' - memory: '20g' + cpus: '32' + memory: '64g' reservations: - cpus: '12' - memory: '20g' + cpus: '32' + memory: '64g' logging: driver: awslogs options: diff --git a/test/ci-stack.test.ts b/test/ci-stack.test.ts index 790380e..eef438c 100644 --- a/test/ci-stack.test.ts +++ b/test/ci-stack.test.ts @@ -138,7 +138,7 @@ test('MainNode', () => { // THEN Template.fromStack(stack).hasResourceProperties('AWS::AutoScaling::LaunchConfiguration', { - InstanceType: 'c5.4xlarge', + InstanceType: 'c5.9xlarge', SecurityGroups: [ { 'Fn::GetAtt': [