GEODE-5488 - Enable docker for all of our gradle tests (apache#2215)

Integration, Performance, UI, Upgrade, Distributed tests will all use the dockerized-gradle-plugin as the test executor when enabled via gradle property. Co-authored-by: Dick Cavender <[email protected]> Co-authored-by: Patrick Rhomberg <[email protected]> Co-authored-by: Robert Houghton <[email protected]>
shjgiser · Jul 27, 2018 · 9902342 · 9902342
1 parent be6d4ca
commit 9902342
Show file tree

Hide file tree

Showing 5 changed files with 269 additions and 165 deletions.
diff --git a/build.gradle b/build.gradle
@@ -82,16 +82,12 @@ if (name == 'geode') {
   ext.scriptDir = 'gradle'
 }
 
-if (project.hasProperty('parallelDunit')) {
-  def pwd = System.getenv('PWD')
-  def geodeDir = new File(pwd).getCanonicalPath()
-  ext.dunitDockerVolumes = ["${geodeDir}":geodeDir]
-}
 
 apply from: "${scriptDir}/utilities.gradle"
 apply from: "${scriptDir}/java.gradle"
 apply from: "${scriptDir}/dependency-resolution.gradle"
 apply from: "${scriptDir}/test.gradle"
+apply from: "${scriptDir}/test-by-category.gradle"
 apply from: "${scriptDir}/publish.gradle"
 apply from: "${scriptDir}/code-analysis.gradle"
 apply from: "${scriptDir}/sonar.gradle"

diff --git a/ci/scripts/test-run.sh b/ci/scripts/test-run.sh
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
@@ -38,6 +38,13 @@
  *                       The default is 'root'.
  */
 
+
+if (project.hasProperty('parallelDunit')) {
+  def pwd = System.getenv('PWD')
+  def geodeDir = new File(pwd).getCanonicalPath()
+  ext.dunitDockerVolumes = ["${geodeDir}":geodeDir]
+}
+
 def dockerConfig = {
   maxParallelForks = dunitParallelForks.toInteger()
 
@@ -110,5 +117,9 @@ subprojects {
     distributedTest.configure(dockerConfig)
     upgradeTest.configure(dockerConfig)
     repeatTest.configure(dockerConfig)
+    integrationTest.configure(dockerConfig)
+//    ACCEPTANCE TEST NEEDS DOCKER-COMPOSE TO WORK WITHIN DOCKER FIRST
+//    acceptanceTest.configure(dockerConfig)
+    uiTest.configure(dockerConfig)
   }
 }