You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2018/09/07 16:56:31 UTC
[geode] branch concourse-staging updated: Parameterizing the number
of CPUs for each job
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch concourse-staging
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/concourse-staging by this push:
new 934c5f2 Parameterizing the number of CPUs for each job
934c5f2 is described below
commit 934c5f2a03a3c24cc7dcf38f60e1ba23bb95e81b
Author: Dan Smith <up...@apache.org>
AuthorDate: Fri Sep 7 09:42:52 2018 -0700
Parameterizing the number of CPUs for each job
Adding a DUNIT_CPU_QUOTA parameter, and adding different dunit jobs for
different experiments.
---
ci/pipelines/geode-build/jinja.template.yml | 1 +
ci/pipelines/shared/jinja.variables.yml | 58 ++++++++++++++++++++++++++++-
ci/scripts/execute_tests.sh | 2 +-
gradle.properties | 2 -
4 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index 749016a..637948e 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -33,6 +33,7 @@
{% macro common_test_params(test) %}
CALL_STACK_TIMEOUT: {{test.CALL_STACK_TIMEOUT}}
DUNIT_PARALLEL_FORKS: {{test.DUNIT_PARALLEL_FORKS}}
+DUNIT_CPU_QUOTA: {{test.DUNIT_CPU_QUOTA}}
MAINTENANCE_VERSION: {{repository.branch}}
PARALLEL_DUNIT: {{test.PARALLEL_DUNIT}}
PUBLIC_BUCKET: ((!public-bucket))
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index fd4789e..0c1f4aa 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -31,15 +31,67 @@ tests:
ARTIFACT_SLUG: acceptancetestfiles
CALL_STACK_TIMEOUT: "1800"
DUNIT_PARALLEL_FORKS: "7"
+ DUNIT_CPU_QUOTA: "4"
GRADLE_TASK: :geode-assembly:acceptanceTest geode-connectors:acceptanceTest
execute_test_timeout: 45m
PARALLEL_DUNIT: "true"
-- name: "Distributed"
+- name: "Distributed_24_4"
+ CPUS: "96"
+ RAM: "180"
+ ARTIFACT_SLUG: distributedtestfiles
+ CALL_STACK_TIMEOUT: "7200"
+ DUNIT_PARALLEL_FORKS: "24"
+ DUNIT_CPU_QUOTA: "4"
+ GRADLE_TASK: distributedTest
+ execute_test_timeout: 2h15m
+ PARALLEL_DUNIT: "true"
+- name: "Distributed_24_8"
CPUS: "96"
RAM: "180"
ARTIFACT_SLUG: distributedtestfiles
CALL_STACK_TIMEOUT: "7200"
DUNIT_PARALLEL_FORKS: "24"
+ DUNIT_CPU_QUOTA: "8"
+ GRADLE_TASK: distributedTest
+ execute_test_timeout: 2h15m
+ PARALLEL_DUNIT: "true"
+- name: "Distributed_48_2"
+ CPUS: "96"
+ RAM: "240"
+ ARTIFACT_SLUG: distributedtestfiles
+ CALL_STACK_TIMEOUT: "7200"
+ DUNIT_PARALLEL_FORKS: "48"
+ DUNIT_CPU_QUOTA: "2"
+ GRADLE_TASK: distributedTest
+ execute_test_timeout: 2h15m
+ PARALLEL_DUNIT: "true"
+- name: "Distributed_48_4"
+ CPUS: "96"
+ RAM: "240"
+ ARTIFACT_SLUG: distributedtestfiles
+ CALL_STACK_TIMEOUT: "7200"
+ DUNIT_PARALLEL_FORKS: "48"
+ DUNIT_CPU_QUOTA: "4"
+ GRADLE_TASK: distributedTest
+ execute_test_timeout: 2h15m
+ PARALLEL_DUNIT: "true"
+- name: "Distributed_96_1"
+ CPUS: "96"
+ RAM: "360"
+ ARTIFACT_SLUG: distributedtestfiles
+ CALL_STACK_TIMEOUT: "7200"
+ DUNIT_PARALLEL_FORKS: "96"
+ DUNIT_CPU_QUOTA: "1"
+ GRADLE_TASK: distributedTest
+ execute_test_timeout: 2h15m
+ PARALLEL_DUNIT: "true"
+- name: "Distributed"
+ CPUS: "96"
+ RAM: "180"
+ ARTIFACT_SLUG: distributedtestfiles
+ CALL_STACK_TIMEOUT: "7200"
+ DUNIT_PARALLEL_FORKS: "48"
+ DUNIT_CPU_QUOTA: "4"
GRADLE_TASK: distributedTest
execute_test_timeout: 2h15m
PARALLEL_DUNIT: "true"
@@ -49,6 +101,7 @@ tests:
ARTIFACT_SLUG: integrationtestfiles
CALL_STACK_TIMEOUT: "1500"
DUNIT_PARALLEL_FORKS: "48"
+ DUNIT_CPU_QUOTA: "4"
GRADLE_TASK: integrationTest
execute_test_timeout: 40m
PARALLEL_DUNIT: "true"
@@ -58,6 +111,7 @@ tests:
ARTIFACT_SLUG: upgradetestfiles
CALL_STACK_TIMEOUT: "3000"
DUNIT_PARALLEL_FORKS: "48"
+ DUNIT_CPU_QUOTA: "4"
GRADLE_TASK: upgradeTest
execute_test_timeout: 1h
PARALLEL_DUNIT: "true"
@@ -67,6 +121,7 @@ tests:
ARTIFACT_SLUG: stressnewtestfiles
CALL_STACK_TIMEOUT: "7200"
DUNIT_PARALLEL_FORKS: "24"
+ DUNIT_CPU_QUOTA: "4"
GRADLE_TASK: repeatTest
execute_test_timeout: 2h15m
PARALLEL_DUNIT: "true"
@@ -76,6 +131,7 @@ windowstests:
tags: "acceptance"
CALL_STACK_TIMEOUT: "1800"
DUNIT_PARALLEL_FORKS: "0"
+ DUNIT_CPU_QUOTA: "4"
PARALLEL_DUNIT: "false"
target_arg: :geode-assembly:acceptanceTest
dir_arg: windows-acceptancetestfiles
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index e270994..cad593d 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -56,7 +56,7 @@ scp -i ${SSHKEY_FILE} ${SCRIPTDIR}/capture-call-stacks.sh geode@${INSTANCE_IP_AD
if [[ -n "${PARALLEL_DUNIT}" && "${PARALLEL_DUNIT}" == "true" ]]; then
PARALLEL_DUNIT="-PparallelDunit -PdunitDockerUser=geode"
if [ -n "${DUNIT_PARALLEL_FORKS}" ]; then
- DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+ DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS} -PdunitCpuQuota=${DUNIT_CPU_QUOTA}"
fi
else
PARALLEL_DUNIT=""
diff --git a/gradle.properties b/gradle.properties
index 442684e..1e83386 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -67,5 +67,3 @@ repeat = 100
org.gradle.caching = true
org.gradle.parallel = false
org.gradle.configureondemand = false
-
-dunitCpuQuota=8