Merge branch 'master' into vncRecorderTimeoutFix

testcontainers · Apr 11, 2020 · 6c7e62f · 6c7e62f
2 parents e911925 + 09cc191
commit 6c7e62f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,7 +14,7 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(),eq(variables.os, 'Linux'))
 - job: jdbc
   steps:
   - task: Gradle@2
@@ -30,7 +30,7 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables.os, 'Linux'))
 - job: modules
   steps:
   - task: Gradle@2
@@ -46,4 +46,4 @@ jobs:
         publishJUnitResults: true
         testResultsFiles: '**/TEST-*.xml'
   - script: wget -q https://get.cimate.io/release/linux/cimate && chmod +x cimate && ./cimate "**/TEST-*.xml"
-    condition: succeededOrFailed()
+    condition: and(succeededOrFailed(), eq(variables.os, 'Linux'))
diff --git a/build.gradle b/build.gradle
@@ -68,6 +68,12 @@ subprojects {
         }
     }
 
+    tasks.withType(Test).all {
+        reports {
+            junitXml.outputPerTestCase = true
+        }
+    }
+
     // Ensure that Javadoc generation is always tested
     check.dependsOn(javadoc)