From e1d747077d067b9a714685f3f064ee2f476e1aaa Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 1 May 2019 09:52:15 +0200
Subject: [PATCH] Fix instability of Junit report uploads on Cirrus

---
 .cirrus.yml | 71 ++++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5f4b154a599..997abd2520f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -105,13 +105,12 @@ validate_task:
     - ./private/cirrus/cirrus-validate.sh postgres106
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 qa_task:
   depends_on: build
@@ -158,15 +157,14 @@ qa_task:
     - ./private/cirrus/cirrus-qa.sh postgres106
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
     screenshots_artifacts:
       path: "**/build/screenshots/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 promote_task:
   depends_on:
@@ -220,13 +218,12 @@ test_sql_mysql57_task:
     - ./private/cirrus/cirrus-db-unit-test.sh mysql57
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 
 test_sql_mssql2017_task:
@@ -257,14 +254,12 @@ test_sql_mssql2017_task:
     - ./private/cirrus/cirrus-db-unit-test.sh mssql2017
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
-
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 test_sql_mssql2019_task:
   depends_on: build
@@ -294,13 +289,12 @@ test_sql_mssql2019_task:
     - ./private/cirrus/cirrus-db-unit-test.sh mssql2019
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 
 # this is the oldest compatible version of PostgreSQL
@@ -331,13 +325,12 @@ test_sql_postgres93_task:
     - ./private/cirrus/cirrus-db-unit-test.sh postgres93
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 test_sql_oracle12_task:
   depends_on: build
@@ -365,13 +358,12 @@ test_sql_oracle12_task:
     - ./private/cirrus/cirrus-db-unit-test.sh oracle12
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 
 test_upgrade_mysql57_task:
@@ -412,13 +404,12 @@ test_upgrade_mysql57_task:
     - ./private/cirrus/cirrus-qa.sh mysql57
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 
 test_upgrade_mssql2017_task:
@@ -458,13 +449,12 @@ test_upgrade_mssql2017_task:
     - ./private/cirrus/cirrus-qa.sh mssql2017
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
 
 
 test_upgrade_oracle12_task:
@@ -502,10 +492,9 @@ test_upgrade_oracle12_task:
     - ./private/cirrus/cirrus-qa.sh oracle12
   cleanup_before_cache_script:
     - ./private/cirrus/cleanup-gradle-cache.sh
-  always:
-    junit_artifacts:
-      path: "**/test-results/**/*.xml"
-      format: junit
   on_failure:
     reports_artifacts:
       path: "**/build/reports/**/*"
+    junit_artifacts:
+      path: "**/test-results/**/*.xml"
+      format: junit
-- 
2.39.5