Merge branch 'opensearch-project:main' into main

opensearch-project · May 16, 2024 · 0a44f6e · 0a44f6e
2 parents 9a9c93d + ce1201d
commit 0a44f6e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -28,4 +28,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           context: "{{defaultContext}}:docker"
           push: true
-          tags: opensearchstaging/jenkins:2.387.1-lts-jdk11,opensearchstaging/jenkins:latest
+          tags: opensearchstaging/jenkins:2.440.2-lts-jdk21,opensearchstaging/jenkins:latest
diff --git a/README.md b/README.md
@@ -286,7 +286,7 @@ This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUC
 
 ## Security
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue.
+If you discover a potential security issue in this project we ask that you notify OpenSearch Security directly via email to security@opensearch.org. Please do **not** create a public GitHub issue.
 
 ## License
 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.387.1-lts-jdk11
+FROM jenkins/jenkins:2.440.2-lts-jdk21
 LABEL maintainer="OpenSearch"
 ENV JAVA_OPTS -Djenkins.install.runSetupWizard=false
 COPY plugins.txt plugins.txt

diff --git a/lib/compute/agent-nodes.ts b/lib/compute/agent-nodes.ts
@@ -217,13 +217,13 @@ export class AgentNodes {
     this.WINDOWS2019_X64_DOCKER_HOST = {
       agentType: 'windows',
       customDeviceMapping: '/dev/sda1=:600:true:::encrypted',
-      workerLabelString: 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host',
-      instanceType: 'C54xlarge',
+      workerLabelString: 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host',
+      instanceType: 'M54xlarge',
       remoteUser: 'Administrator',
       maxTotalUses: 10,
       minimumNumberOfSpareInstances: 4,
       numExecutors: 4,
-      amiId: 'ami-0a9759da263ce9304',
+      amiId: 'ami-01f81782f09e99d95',
       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 '
@@ -234,13 +234,13 @@ export class AgentNodes {
     this.WINDOWS2019_X64_DOCKER_BUILDER = {
       agentType: 'windows',
       customDeviceMapping: '/dev/sda1=:300:true:::encrypted',
-      workerLabelString: 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Builder',
-      instanceType: 'C54xlarge',
+      workerLabelString: 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Builder',
+      instanceType: 'M54xlarge',
       remoteUser: 'Administrator',
       maxTotalUses: 10,
       minimumNumberOfSpareInstances: 1,
       numExecutors: 1,
-      amiId: 'ami-0a9759da263ce9304',
+      amiId: 'ami-01f81782f09e99d95',
       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 '

diff --git a/packer/jenkins-agent-win2019-x64.json b/packer/jenkins-agent-win2019-x64.json
@@ -17,7 +17,7 @@
       "encrypt_boot":"false",
       "region":"{{user `build-region`}}",
       "ami_regions":"{{user `aws_ami_region`}}",
-      "instance_type":"c5.4xlarge",
+      "instance_type":"m5.4xlarge",
       "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 30"
+        "C:\\Users\\Administrator\\jenkins\\winrm_max_memory.ps1 62"
       ]
     },
     {

diff --git a/packer/scripts/windows/winrm_max_memory.ps1 b/packer/scripts/windows/winrm_max_memory.ps1
@@ -6,7 +6,7 @@
 # compatible open source license.
 
 echo "The max amount of the winrm memory is not the same on different instance type and might cause the server unresponsive upon startup"
-echo "The only examples we have now is C54xlarge can have 30/32GB on WINRM, C524large 190/192GB, M58xlarge 110/128GB without failures"
+echo "The only examples we have now is C54xlarge can have 30/32GB on WINRM, C524large 190/192GB, M54xlarge 62/64GB, M58xlarge 110/128GB without failures"
 
 $memorygb = [int]$args[0]
 $memorygb