Update jenkinsfile with latest Windows M54xlarge Agents (#4642)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Apr 15, 2024 · 2e75add · 2e75add
1 parent 10eb098
commit 2e75add
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
     environment {
         AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
         AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host'
-        AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host'
+        AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already
         IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper
         IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution

diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -30,7 +30,7 @@ def docker_args = [
 def agent_nodes = [
     "linux_x64": "Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host",
     "linux_arm64": "Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host",
-    "windows_x64": "Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host",
+    "windows_x64": "Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host",
 ]
 
 pipeline {

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
     environment {
         AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
         AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host'
-        AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host'
+        AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_LINUX_RPM = 'opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1' // required for rpm to create digest sha256 correctly with rpm 4.12+, still define here for 1.x version as 2.x+ moved to rockylinux8, later almalinux8, already
         IMAGE_LINUX_DEB = 'opensearchstaging/ci-runner:ci-runner-ubuntu2004-opensearch-build-v2' // required for deb to create pkg using debmake/debuild/debhelper
         IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -30,7 +30,7 @@ def docker_args = [
 def agent_nodes = [
     'linux_x64': 'Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host',
     'linux_arm64': 'Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host',
-    'windows_x64': 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host',
+    'windows_x64': 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host',
 ]
 
 pipeline {

diff --git a/jenkins/opensearch/publish-min-snapshots.jenkinsfile b/jenkins/opensearch/publish-min-snapshots.jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
         AGENT_LINUX_X64 = 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host'
         AGENT_LINUX_ARM64 = 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host'
         AGENT_MACOS_X64 = 'Jenkins-Agent-MacOS12-X64-Mac1Metal-Multi-Host'
-        AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host'
+        AGENT_WINDOWS_X64 = 'Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host'
         IMAGE_WINDOWS_ZIP = 'opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1' // required for windows to build zip distribution
     }
     parameters {

diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile
@@ -34,7 +34,7 @@ def agent_nodes_docker = [
 ]
 
 def agent_nodes = [
-    "windows_x64": "Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host",
+    "windows_x64": "Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host",
     "linux_x64": "Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host",
     "linux_arm64": "Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host",
 ]

diff --git a/...jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt b/...jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt
@@ -66,7 +66,7 @@
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
-                     validate-artifacts.node(Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host, groovy.lang.Closure)
+                     validate-artifacts.node(Jenkins-Agent-Windows2019-X64-M54xlarge-Docker-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
                         validate-artifacts.validateArtifacts({version=2.3.0, distribution=zip, arch=x64, platform=windows, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, artifact_type=production, allow_http=false})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)