Skip to content

Commit

Permalink
Make all integTest having resource locking (opensearch-project#4039)
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon authored Sep 19, 2023
1 parent c988f82 commit e0e8695
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
9 changes: 5 additions & 4 deletions jenkins/opensearch-dashboards/integ-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
6 changes: 3 additions & 3 deletions jenkins/opensearch/integ-test.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit e0e8695

Please sign in to comment.