Defined task outputs for compose tasks

rewe-digital · Nov 27, 2018 · b477e9d · b477e9d
1 parent 872024d
commit b477e9d
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 }
 
 group = 'org.rewedigital'
-version = '0.2'
+version = '0.3'
 
 gradlePlugin {
     plugins {

diff --git a/src/main/groovy/org/rewedigital/frost/tasks/FrostComposeKillTask.groovy b/src/main/groovy/org/rewedigital/frost/tasks/FrostComposeKillTask.groovy
@@ -1,11 +1,16 @@
 package org.rewedigital.frost.tasks
 
-
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.rewedigital.frost.util.Util
 
 class FrostComposeKillTask extends DockerComposeTask {
 
+    @OutputDirectory
+    def getReportDirectory() {
+        Util.composeOutputDirectory(project)
+    }
+
     @TaskAction
     @Override
     def action() {
@@ -16,7 +21,7 @@ class FrostComposeKillTask extends DockerComposeTask {
             cmd << "-f"
             cmd << getComposeOverrideFile()
             cmd << "kill"
-            Util.executeSynchronously(cmd, "docker_compose_kill")
+            Util.executeSynchronously(cmd, "docker_compose_kill", getReportDirectory())
 
             cmd = [EXECUTABLE]
             cmd << "-f"
@@ -26,7 +31,7 @@ class FrostComposeKillTask extends DockerComposeTask {
             cmd << "rm"
             cmd << "-f"
             cmd << "-v"
-            Util.executeSynchronously(cmd, "docker_compose_rm")
+            Util.executeSynchronously(cmd, "docker_compose_rm", getReportDirectory())
         } finally {
             getComposeOverrideFile().delete()
         }

diff --git a/src/main/groovy/org/rewedigital/frost/tasks/FrostComposePullTask.groovy b/src/main/groovy/org/rewedigital/frost/tasks/FrostComposePullTask.groovy
@@ -1,20 +1,25 @@
 package org.rewedigital.frost.tasks
 
-
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.rewedigital.frost.util.Util
 
 import static org.rewedigital.frost.FrostPluginExtension.EXTENSION_NAME
 
 class FrostComposePullTask extends DockerComposeTask {
 
+    @OutputDirectory
+    def getReportDirectory() {
+        Util.composeOutputDirectory(project)
+    }
+
     @TaskAction
     @Override
     def action() {
         def cmd = ["/bin/sh"]
         cmd << "-c"
         cmd << "export TAG=${project.extensions[EXTENSION_NAME].sutTag} && ${EXECUTABLE} -f ${getComposeFile()} -f ${getComposeOverrideFile()} pull --ignore-pull-failures"
 
-        Util.executeSynchronously(cmd, "docker_compose_pull")
+        Util.executeSynchronously(cmd, "docker_compose_pull", getReportDirectory())
     }
 }
diff --git a/src/main/groovy/org/rewedigital/frost/tasks/FrostComposeUpTask.groovy b/src/main/groovy/org/rewedigital/frost/tasks/FrostComposeUpTask.groovy
@@ -1,19 +1,25 @@
 package org.rewedigital.frost.tasks
 
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.rewedigital.frost.util.Util
 
 import static org.rewedigital.frost.FrostPluginExtension.EXTENSION_NAME
 
 class FrostComposeUpTask extends DockerComposeTask {
 
+    @OutputDirectory
+    def getReportDirectory() {
+        Util.composeOutputDirectory(project)
+    }
+
     @TaskAction
     @Override
     def action() {
         def cmd = ["/bin/sh"]
         cmd << "-c"
         cmd << "export TAG=${project.extensions[EXTENSION_NAME].sutTag} && ${EXECUTABLE} -f ${getComposeFile()} -f ${getComposeOverrideFile()} up"
 
-        Util.executeAsynchronously(cmd, "docker_compose_up")
+        Util.executeAsynchronously(cmd, "docker_compose_up", getReportDirectory())
     }
 }
diff --git a/src/main/groovy/org/rewedigital/frost/tasks/FrostRunTask.groovy b/src/main/groovy/org/rewedigital/frost/tasks/FrostRunTask.groovy
@@ -4,6 +4,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.rewedigital.frost.browsers.Browser
 import org.rewedigital.frost.util.Util
@@ -19,6 +20,15 @@ class FrostRunTask extends DefaultTask {
 
     private static final int TESTSUITE_TIMEOUT_MILLIS = HOURS.toMillis(1)
 
+    @OutputDirectory
+    def getTestReportDirectory() {
+        new File(project.buildDir, "reports/tests/frost")
+    }
+
+    @OutputDirectory
+    def getJunitTestReportDirectory() {
+        new File(project.buildDir, "test-results/frost")
+    }
 
     @TaskAction
     def action() {
@@ -71,7 +81,7 @@ class FrostRunTask extends DefaultTask {
             def seleniumDriverUrl = "http://localhost:${browserPort}/wd/hub"
             def thread = new Thread({
                 try {
-                    def reportsDirectoryName = "build/reports/tests/uiTest/${browser.browserId}/${testSuitesDirectory.name}"
+                    def reportsDirectoryName = "${getTestReportDirectory()}/${browser.browserId}/${testSuitesDirectory.name}"
                     executeTestSuitesOnSpecificBrowser(testSuitesDirectory, reportsDirectoryName, seleniumDriverUrl, browser.browserId, testGroups, recursive)
                 } catch (Exception e) {
                     lastException = e
@@ -95,7 +105,7 @@ class FrostRunTask extends DefaultTask {
 
         def cmd = ["${workingDirectory}/galen/galen", "test", "${testSuitesDirectory.toString()}",
                    "--htmlreport", "${reportsDirectoryName}",
-                   "--junitreport", "build/test-results/uiTest/TEST-${browser}.xml",
+                   "--junitreport", "${getJunitTestReportDirectory()}/TEST-${browser}.xml",
                    "--parallel-tests", "${numberOfParallelTests}",
                    "-Dgalen.settings.website=http://${targetHost()}:${project.extensions[EXTENSION_NAME].sutPort}"]
 

diff --git a/src/main/groovy/org/rewedigital/frost/util/Util.groovy b/src/main/groovy/org/rewedigital/frost/util/Util.groovy
@@ -47,6 +47,9 @@ class Util {
         makeAbsoluteIfIsRelative(cacheDirectory, project.projectDir)
     }
 
+    static File composeOutputDirectory(project) {
+        new File(project.buildDir, "reports/frost-logs")
+    }
 
     private static File makeAbsoluteIfIsRelative(File possiblyRelativeDirectory, File baseDirectory) {
         possiblyRelativeDirectory.isAbsolute() ?
@@ -79,17 +82,16 @@ class Util {
         browser
     }
 
-    static int executeSynchronously(cmd, processIdentifier) {
-        return executeInternal(cmd, true, processIdentifier)
+    static int executeSynchronously(cmd, processIdentifier, logDirectory) {
+        return executeInternal(cmd, true, processIdentifier, logDirectory)
     }
 
-    static int executeAsynchronously(cmd, processIdentifier, failFast = true) {
-        return executeInternal(cmd, false, processIdentifier, failFast)
+    static int executeAsynchronously(cmd, processIdentifier, logDirectory, failFast = true) {
+        return executeInternal(cmd, false, processIdentifier, logDirectory, failFast)
     }
 
-    private static int executeInternal(cmd, executeSynchronously, processIdentifier, failFast = true) {
+    private static int executeInternal(cmd, executeSynchronously, processIdentifier, logDirectory, failFast = true) {
         LOG.info("Executing '{}'", cmd.join(" "))
-        def logDirectory = new File('build/reports/frost-logs')
         def logFile = new File(logDirectory, "${processIdentifier}.log")
         logFile.parentFile.mkdirs()