Updating integTest to use the new M54xlarge/C6g4xlarge agents (#4594)

peterzhuamazon · web-flow · commit 0db25a8f6212 · 2024-03-29T16:18:20.000-04:00
Signed-off-by: Peter Zhu &lt;zhujiaxi@amazon.com&gt;
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -28,8 +28,8 @@ def docker_args = [
 ]
 
 def agent_nodes = [
-    "linux_x64": "Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host",
-    "linux_arm64": "Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host",
+    "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",
 ]
 
diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -28,8 +28,8 @@ def docker_args = [
 ]
 
 def agent_nodes = [
-    'linux_x64': 'Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host',
-    'linux_arm64': 'Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host',
+    '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',
 ]
 
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test-without-validation.jenkinsfile.txt
@@ -8,7 +8,7 @@
          integ-test.buildDiscarder(null)
          integ-test.echo(Executing on agent [label:none])
          integ-test.stage(verify-parameters, groovy.lang.Closure)
-            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             integ-test.script(groovy.lang.Closure)
                integ-test.fileExists(manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar/builds/opensearch-dashboards/opensearch-dashboards-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt
@@ -8,7 +8,7 @@
          integ-test.buildDiscarder(null)
          integ-test.echo(Executing on agent [label:none])
          integ-test.stage(verify-parameters, groovy.lang.Closure)
-            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             integ-test.script(groovy.lang.Closure)
                integ-test.fileExists(manifests/tests/jenkins/data/opensearch-dashboards-3.0.0-test.yml)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/3.0.0/215/linux/x64/tar/builds/opensearch-dashboards/opensearch-dashboards-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-dashboards-3.0.0-build.yml})
@@ -38,7 +38,7 @@
          integ-test.postCleanup()
             postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
          integ-test.stage(validate-artifacts, groovy.lang.Closure)
-            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             integ-test.script(groovy.lang.Closure)
                integ-test.string({name=VERSION, value=3.0.0})
                integ-test.string({name=DISTRIBUTION, value=tar})
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test-without-validation.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test-without-validation.jenkinsfile.txt
@@ -8,7 +8,7 @@
          integ-test.buildDiscarder(null)
          integ-test.echo(Executing on agent [label:none])
          integ-test.stage(verify-parameters, groovy.lang.Closure)
-            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             integ-test.script(groovy.lang.Closure)
                integ-test.fileExists(manifests/tests/jenkins/data/opensearch-3.0.0-test.yml)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/9010/linux/x64/tar/dist/opensearch/opensearch-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-3.0.0-build.yml})
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt
@@ -8,7 +8,7 @@
          integ-test.buildDiscarder(null)
          integ-test.echo(Executing on agent [label:none])
          integ-test.stage(verify-parameters, groovy.lang.Closure)
-            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             integ-test.script(groovy.lang.Closure)
                integ-test.fileExists(manifests/tests/jenkins/data/opensearch-3.0.0-test.yml)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/3.0.0/9010/linux/x64/tar/dist/opensearch/opensearch-3.0.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-3.0.0-build.yml})
@@ -26,7 +26,7 @@
          integ-test.postCleanup()
             postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
          integ-test.stage(validate-artifacts, groovy.lang.Closure)
-            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host])
+            integ-test.echo(Executing on agent [label:Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host])
             integ-test.script(groovy.lang.Closure)
                integ-test.string({name=VERSION, value=3.0.0})
                integ-test.string({name=DISTRIBUTION, value=tar})

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ def docker_args = [`
`28`	`28`	`]`
`29`	`29`
`30`	`30`	`def agent_nodes = [`
`31`		`- "linux_x64": "Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host",`
`32`		`- "linux_arm64": "Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Docker-Host",`
	`31`	`+ "linux_x64": "Jenkins-Agent-AL2023-X64-M54xlarge-Docker-Host",`
	`32`	`+ "linux_arm64": "Jenkins-Agent-AL2023-Arm64-M6g4xlarge-Docker-Host",`
`33`	`33`	`"windows_x64": "Jenkins-Agent-Windows2019-X64-C54xlarge-Docker-Host",`
`34`	`34`	`]`
`35`	`35`