Skip to content

Commit

Permalink
Restore all the way back to original c524xlarge as m58xlarge just not…
Browse files Browse the repository at this point in the history
… stable on Windows (opensearch-project#368)

* Restore all the way back to original c524xlarge as m58xlarge just not stable

Signed-off-by: Peter Zhu <[email protected]>

* Restore settings

Signed-off-by: Peter Zhu <[email protected]>

---------

Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon authored Oct 26, 2023
1 parent 29fa83c commit 3afe4fe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 1 addition & 5 deletions lib/compute/agent-nodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,7 @@ export class AgentNodes {
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-0537ed23ad8d98fbd',
initScript: 'echo %USERNAME% && dockerd --register-service && net start docker && echo started docker deamon && docker ps && '
+ 'echo initializing docker images now waiting for 5min && git clone https://github.com/opensearch-project/opensearch-build.git && '
+ 'bash.exe -c "docker run --rm -it --name docker-windows-test -d `opensearch-build/docker/ci/get-ci-images.sh '
+ '-p windows2019-servercore -u opensearch -t build | head -1` bash.exe && sleep 5" && docker exec docker-windows-test whoami && '
+ 'docker ps && docker stop docker-windows-test && docker ps && rm -rf opensearch-build',
initScript: 'echo',
remoteFs: 'C:/Users/Administrator/jenkins',
};
this.AL2_X64_DEFAULT_AGENT = {
Expand Down
6 changes: 3 additions & 3 deletions packer/jenkins-agent-win2019-x64-gradle-check.json
Original file line number Diff line number Diff line change
Expand Up @@ -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`}}",
Expand Down Expand Up @@ -68,7 +68,7 @@
{
"type":"powershell",
"inline": [
"C:\\Users\\Administrator\\jenkins\\winrm_max_memory.ps1 126"
"C:\\Users\\Administrator\\jenkins\\winrm_max_memory.ps1 190"
]
},
{
Expand All @@ -89,7 +89,7 @@
"type":"powershell",
"inline": [
"C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule",
"C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1"
"C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\SysprepInstance.ps1 -NoShutdown"
]
}
]
Expand Down

0 comments on commit 3afe4fe

Please sign in to comment.