[geode] branch develop updated: GEODE-5601: Serialize running of acceptance tests in lieu of containerizing them (#2389)

[kh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new ad37e34  GEODE-5601: Serialize running of acceptance tests in lieu of containerizing them (#2389)
ad37e34 is described below

commit ad37e34eaf00b94f13cbf4dd0f9e435a987af86b
Author: Kenneth Howe <kh...@pivotal.io>
AuthorDate: Wed Aug 29 08:57:12 2018 -0700

    GEODE-5601: Serialize running of acceptance tests in lieu of containerizing them (#2389)
    
    * GEODE-5601: Serialize running of acceptance tests in lieu of containerizing them
    
    Fix flaky AccpetanceTest runs by running them serially. Note that this does make a
    hit on the runtime (~ 10% in testing) for this category of test.
---
 ci/pipelines/geode-build/jinja.template.yml  | 1 +
 ci/pipelines/pull-request/jinja.template.yml | 1 +
 ci/pipelines/shared/jinja.variables.yml      | 7 ++++---
 ci/scripts/execute_tests.sh                  | 7 ++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml b/ci/pipelines/geode-build/jinja.template.yml
index c15fad0..e94c99d 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -35,6 +35,7 @@ CALL_STACK_TIMEOUT: {{test.CALL_STACK_TIMEOUT}}
 DUNIT_PARALLEL_FORKS: {{test.DUNIT_PARALLEL_FORKS}}
 MAINTENANCE_VERSION: {{repository.branch}}
 PARALLEL_DUNIT: {{test.PARALLEL_DUNIT}}
+PARALLEL_GRADLE: {{test.PARALLEL_GRADLE}}
 PUBLIC_BUCKET: ((!public-bucket))
 SERVICE_ACCOUNT: ((!concourse-gcp-account))
 {% endmacro %}
diff --git a/ci/pipelines/pull-request/jinja.template.yml b/ci/pipelines/pull-request/jinja.template.yml
index edb98b0..07a4649 100644
--- a/ci/pipelines/pull-request/jinja.template.yml
+++ b/ci/pipelines/pull-request/jinja.template.yml
@@ -192,6 +192,7 @@ jobs:
           GRADLE_TASK_OPTIONS: ""
           MAINTENANCE_VERSION: {{repository.branch}}
           PARALLEL_DUNIT: {{test.PARALLEL_DUNIT}}
+          PARALLEL_GRADLE: {{test.PARALLEL_GRADLE}}
           PUBLIC_BUCKET: ((!public-bucket))
           SERVICE_ACCOUNT: ((!concourse-gcp-account))
         run:
diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml
index fd4789e..85d495a 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -30,10 +30,11 @@ tests:
   RAM: "12"
   ARTIFACT_SLUG: acceptancetestfiles
   CALL_STACK_TIMEOUT: "1800"
-  DUNIT_PARALLEL_FORKS: "7"
-  GRADLE_TASK: :geode-assembly:acceptanceTest geode-connectors:acceptanceTest
+  DUNIT_PARALLEL_FORKS: "0"
+  GRADLE_TASK: acceptanceTest
   execute_test_timeout: 45m
-  PARALLEL_DUNIT: "true"
+  PARALLEL_DUNIT: "false"
+  PARALLEL_GRADLE: "false"
 - name: "Distributed"
   CPUS: "96"
   RAM: "180"
diff --git a/ci/scripts/execute_tests.sh b/ci/scripts/execute_tests.sh
index e270994..d36f85b 100755
--- a/ci/scripts/execute_tests.sh
+++ b/ci/scripts/execute_tests.sh
@@ -36,7 +36,12 @@ fi
 
 REPODIR=$(cd geode; git rev-parse --show-toplevel)
 
-DEFAULT_GRADLE_TASK_OPTIONS="--parallel --console=plain --no-daemon -x javadoc -x spotlessCheck -x rat"
+if [[ ${PARALLEL_GRADLE:-"true"} == "true" ]]; then
+  PARALLEL_GRADLE="--parallel"
+else
+  PARALLEL_GRADLE=""
+fi
+DEFAULT_GRADLE_TASK_OPTIONS="${PARALLEL_GRADLE} --console=plain --no-daemon -x javadoc -x spotlessCheck -x rat"
 
 
 SSHKEY_FILE="instance-data/sshkey"