Lock integTest resources to 4cpu/16g on linux agents (#4597)

peterzhuamazon · web-flow · commit 6a09aeb4aa33 · 2024-03-29T18:14:27.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
@@ -21,9 +21,9 @@ def docker_images = [
 ]
 
 def docker_args = [
-    "tar": "-u 1000",
-    "rpm": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host",
-    "deb": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host",
+    "tar": "-u 1000 --cpus 4 -m 16g",
+    "rpm": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host --cpus 4 -m 16g",
+    "deb": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host --cpus 4 -m 16g",
     "zip": "-u ContainerAdministrator",
 ]
 
diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -21,9 +21,9 @@ def docker_images = [
 ]
 
 def docker_args = [
-    'tar': '-u 1000',
-    'rpm': '--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host',
-    'deb': '--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host',
+    'tar': '-u 1000 --cpus 4 -m 16g',
+    'rpm': '--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host --cpus 4 -m 16g',
+    'deb': '--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host --cpus 4 -m 16g',
     'zip': '-u ContainerAdministrator',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ def docker_images = [`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`def docker_args = [`
`24`		`- "tar": "-u 1000",`
`25`		`- "rpm": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host",`
`26`		`- "deb": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host",`
	`24`	`+ "tar": "-u 1000 --cpus 4 -m 16g",`
	`25`	`+ "rpm": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host --cpus 4 -m 16g",`
	`26`	`+ "deb": "--entrypoint=/usr/lib/systemd/systemd -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:rw --cgroupns=host --cpus 4 -m 16g",`
`27`	`27`	`"zip": "-u ContainerAdministrator",`
`28`	`28`	`]`
`29`	`29`