From aa74127a635111b4ffdd7ec891e61849163f7b98 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 11 Oct 2023 16:02:53 -0400 Subject: [PATCH] Switch back to c5.24large before further investigation0 on windows runner Signed-off-by: Peter Zhu --- packer/jenkins-agent-win2019-x64-gradle-check.json | 11 +++-------- packer/jenkins-agent-win2019-x64.json | 7 +------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/packer/jenkins-agent-win2019-x64-gradle-check.json b/packer/jenkins-agent-win2019-x64-gradle-check.json index e3ff6e11..6a4d6103 100644 --- a/packer/jenkins-agent-win2019-x64-gradle-check.json +++ b/packer/jenkins-agent-win2019-x64-gradle-check.json @@ -17,7 +17,7 @@ "encrypt_boot":"false", "region":"{{user `build-region`}}", "ami_regions":"{{user `aws_ami_region`}}", - "instance_type":"m5.8xlarge", + "instance_type":"c5.24xlarge", "ami_name":"{{user `name-base`}}-{{user `build-time`}}", "vpc_id":"{{user `build-vpc`}}", "subnet_id":"{{user `build-subnet`}}", @@ -68,7 +68,7 @@ { "type":"powershell", "inline": [ - "C:\\Users\\Administrator\\jenkins\\winrm_max_memory.ps1 110" + "C:\\Users\\Administrator\\jenkins\\winrm_max_memory.ps1 190" ] }, { @@ -87,12 +87,7 @@ { "type":"powershell", "inline": [ - "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule" - ] - }, - { - "type":"powershell", - "inline": [ + "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule", "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1 -NoShutdown" ] } diff --git a/packer/jenkins-agent-win2019-x64.json b/packer/jenkins-agent-win2019-x64.json index ff46b0d5..7aaf8bfb 100644 --- a/packer/jenkins-agent-win2019-x64.json +++ b/packer/jenkins-agent-win2019-x64.json @@ -87,12 +87,7 @@ { "type":"powershell", "inline": [ - "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule" - ] - }, - { - "type":"powershell", - "inline": [ + "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule", "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1 -NoShutdown" ] }