From c7ac159eb70fb088708b96376843b06a65e5a2dd Mon Sep 17 00:00:00 2001 From: Peter Zhu <zhujiaxi@amazon.com> Date: Wed, 11 Oct 2023 20:51:26 -0400 Subject: [PATCH] Make sure noshutdown settings is removed for windows instances Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --- packer/jenkins-agent-win2019-x64-gradle-check.json | 6 +++--- packer/jenkins-agent-win2019-x64.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/jenkins-agent-win2019-x64-gradle-check.json b/packer/jenkins-agent-win2019-x64-gradle-check.json index 6a4d6103..95022ae4 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":"c5.24xlarge", + "instance_type":"m5.8xlarge", "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 190" + "C:\\Users\\Administrator\\jenkins\\winrm_max_memory.ps1 126" ] }, { @@ -88,7 +88,7 @@ "type":"powershell", "inline": [ "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule", - "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1 -NoShutdown" + "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1" ] } ] diff --git a/packer/jenkins-agent-win2019-x64.json b/packer/jenkins-agent-win2019-x64.json index 7aaf8bfb..046dae4a 100644 --- a/packer/jenkins-agent-win2019-x64.json +++ b/packer/jenkins-agent-win2019-x64.json @@ -88,7 +88,7 @@ "type":"powershell", "inline": [ "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule", - "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1 -NoShutdown" + "C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1" ] } ]