Revert "Make all integTest having resource locking (opensearch-projec…

…t#4039)" This reverts commit e0e8695.
peterzhuamazon · Sep 19, 2023 · 4249939 · 4249939
1 parent e0e8695
commit 4249939
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -10,12 +10,11 @@ def docker_images = [
     "zip": "opensearchstaging/ci-runner:ci-runner-windows2019-servercore-opensearch-build-v1",
 ]
 
-// Note: The resource locking must be complied with the AGENT_NODE specs above
 def docker_args = [
-    "tar": "-u 1000 --cpus 4 --memory 8g",
-    "rpm": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro --cpus 4 --memory 8g",
-    "deb": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro --cpus 4 --memory 8g",
-    "zip": "-u ContainerAdministrator --cpus 4 --memory 8g",
+    "tar": "-u 1000",
+    "rpm": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro",
+    "deb": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro",
+    "zip": "-u ContainerAdministrator",
 ]
 
 def agent_nodes = [

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -13,9 +13,9 @@ def docker_images = [
 // Note: The resource locking must be complied with the AGENT_NODE specs above
 def docker_args = [
     "tar": "-u 1000 --cpus 4 --memory 8g",
-    "rpm": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro --cpus 4 --memory 8g",
-    "deb": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro --cpus 4 --memory 8g",
-    "zip": "-u ContainerAdministrator --cpus 4 --memory 8g",
+    "rpm": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro",
+    "deb": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro",
+    "zip": "-u ContainerAdministrator",
 ]
 
 def agent_nodes = [