Make all integTest having resource locking (#4039)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Sep 19, 2023 · e0e8695 · e0e8695
1 parent c988f82
commit e0e8695
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -10,11 +10,12 @@ 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",
- "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",
+ "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",
 ]
 
 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",
- "deb": "--entrypoint=/usr/sbin/init -u root --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro",
- "zip": "-u ContainerAdministrator",
+ "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",
 ]
 
 def agent_nodes = [